Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24576/src/server
Modified Files:
sql_env.mx sql_mvc.mx
Log Message:
propagated changes of Thursday Oct 25 2007 - Monday Oct 29 2007
from the SQL_2-20 branch to the development trunk
Index: sql_mvc.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_mvc.mx,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- sql_mvc.mx 13 Oct 2007 14:08:50 -0000 1.191
+++ sql_mvc.mx 29 Oct 2007 20:11:44 -0000 1.192
@@ -671,6 +671,7 @@
sql_session_destroy(m->session);
stack_pop_until(m, 0);
+ _DELETE(m->vars);
if (m->scanner.log) /* close and destroy stream */
close_stream(m->scanner.log);
@@ -1405,8 +1406,8 @@
_DELETE(v->name);
if (v->s) {
stmt_destroy(v->s);
- v->value.vtype = 0;
VALclear(&v->value);
+ v->value.vtype = 0;
if (v->type.comp_type && v->view)
table_destroy(v->type.comp_type);
}
@@ -1421,8 +1422,8 @@
stmt_destroy(v->s);
_DELETE(v->name);
- v->value.vtype = 0;
VALclear(&v->value);
+ v->value.vtype = 0;
if (v->type.comp_type && v->view)
table_destroy(v->type.comp_type);
}
Index: sql_env.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_env.mx,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- sql_env.mx 21 Aug 2007 22:24:36 -0000 1.65
+++ sql_env.mx 29 Oct 2007 20:11:44 -0000 1.66
@@ -151,6 +151,7 @@
/* add function */
l = list_create((fdestroy) &arg_destroy);
mvc_create_func(m, s, "env", l, &tpe, FALSE, FALSE, "sql",
"sql_environment", 1);
+ list_destroy(l);
t = mvc_create_generated(m, s, "#var", NULL, 1);
mvc_create_column_(m, t, "name", "varchar", 1024);
@@ -162,6 +163,7 @@
/* add function */
l = list_create((fdestroy) &arg_destroy);
mvc_create_func(m, s, "var", l, &tpe, FALSE, FALSE, "sql",
"sql_variables", 1);
+ list_destroy(l);
return 0;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
