Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16827/src/server
Modified Files:
sql_mvc.mx
Log Message:
propagated changes of Saturday Jan 30 2010 - Sunday Jan 31 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/30 - nielsnes: src/server/sql_mvc.mx,1.233.2.1
fix cleanup code
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_mvc.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_mvc.mx,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- sql_mvc.mx 11 Jan 2010 11:34:19 -0000 1.233
+++ sql_mvc.mx 31 Jan 2010 12:44:56 -0000 1.234
@@ -1536,13 +1536,12 @@
sql_var *v = &sql->vars[--sql->topvars];
_DELETE(v->name);
- if (v->s) {
- stmt_destroy(v->s);
- VALclear(&v->value);
- v->value.vtype = 0;
- if (v->type.comp_type && v->view)
- table_destroy(v->type.comp_type);
- }
+ VALclear(&v->value);
+ v->value.vtype = 0;
+ if (v->type.comp_type && v->view)
+ table_destroy(v->type.comp_type);
+ else if (v->s && v->view)
+ rel_destroy(v->s);
}
}
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
