Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17167/src/server
Modified Files:
rel_subquery.mx
Log Message:
propagated changes of Wednesday Mar 17 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/03/17 - mr-meltdown: src/server/rel_subquery.mx,1.12.2.2
plug stream leaks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_subquery.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_subquery.mx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rel_subquery.mx 31 Jan 2010 12:44:51 -0000 1.13
+++ rel_subquery.mx 17 Mar 2010 13:46:45 -0000 1.14
@@ -428,6 +428,7 @@
char *n;
int len = _strlen(query);
exp_kind ek = {type_value, card_value, FALSE};
+ stream *s;
m->qc = NULL;
@@ -442,9 +443,8 @@
query[len+1] = 0;
len++;
buffer_init(b, query, len);
- scanner_init( &m->scanner,
- bstream_create(buffer_rastream(b, "sqlstatement"), b->len),
- NULL);
+ s = buffer_rastream(b, "sqlstatement");
+ scanner_init(&m->scanner, bstream_create(s, b->len), NULL);
m->scanner.mode = LINE_1;
bstream_next(m->scanner.rs);
@@ -471,6 +471,7 @@
GDKfree(query);
GDKfree(b);
bstream_destroy(m->scanner.rs);
+ stream_destroy(s);
m->sym = NULL;
if (m->session->status || m->errstr[0]) {
@@ -496,6 +497,7 @@
char *n;
int len = _strlen(query);
exp_kind ek = {type_value, card_value, FALSE};
+ stream *sr;
m->qc = NULL;
@@ -510,9 +512,8 @@
query[len+1] = 0;
len++;
buffer_init(b, query, len);
- scanner_init( &m->scanner,
- bstream_create(buffer_rastream(b, "sqlstatement"), b->len),
- NULL);
+ sr = buffer_rastream(b, "sqlstatement");
+ scanner_init(&m->scanner, bstream_create(sr, b->len), NULL);
m->scanner.mode = LINE_1;
bstream_next(m->scanner.rs);
@@ -536,6 +537,7 @@
GDKfree(query);
GDKfree(b);
bstream_destroy(m->scanner.rs);
+ stream_destroy(sr);
m->sym = NULL;
if (m->session->status || m->errstr[0]) {
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
