Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22708/src/backends/monet4
Modified Files:
Tag: SQL_2-16
sql_gencode.mx sql_server.mx
Log Message:
all mil tests now get HAVE_MONETDB4 conditional
removed backend_interpret (not needed anymore)
fixed 2 leaks in m5/sql
1) in str_cast (obvious unused/not freed GDKmalloc)
2) when destroying functions from the cache we no also correctly
cleanup the stack
Index: sql_server.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_server.mx,v
retrieving revision 1.157.2.1
retrieving revision 1.157.2.2
diff -u -d -r1.157.2.1 -r1.157.2.2
--- sql_server.mx 13 Feb 2007 12:06:33 -0000 1.157.2.1
+++ sql_server.mx 21 Feb 2007 10:06:32 -0000 1.157.2.2
@@ -328,7 +328,6 @@
memset((char *)be_funcs, '\0', sizeof(backend_functions));
be_funcs->fstack = &monet4_freestack;
be_funcs->fcode = &monet4_freecode;
- be_funcs->finterpret = &monet4_parse;
monet4_user_init(be_funcs);
backend_init(be_funcs); /* we probably leak be_funcs here */
CNTXTclient(stk, &father);
@@ -878,7 +877,8 @@
r = GDKstrdup(v);
}
if (*len > 0 && sz > *len) {
- GDKfree(r);
+ if (r)
+ GDKfree(r);
if (ATOMcmp(TYPE_str, ATOMnilptr(TYPE_str), v) != 0) {
GDKerror("str_cast: value too long for type
(var)char(%d)\n", *len);
return GDK_FAIL;
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_gencode.mx,v
retrieving revision 1.147.2.1
retrieving revision 1.147.2.2
diff -u -d -r1.147.2.1 -r1.147.2.2
--- sql_gencode.mx 4 Feb 2007 17:03:15 -0000 1.147.2.1
+++ sql_gencode.mx 21 Feb 2007 10:06:32 -0000 1.147.2.2
@@ -40,7 +40,6 @@
sql_server_export int backend_exec_prepared_stmt( backend *be, cq *q );
sql_server_export void monet4_freecode(backend_code code, backend_stack stk,
int nr, char *name);
-sql_server_export void monet4_parse(backend_stack stk, char *code);
#endif /*_SQL_GENCODE_H_*/
@@ -1657,12 +1656,6 @@
return err;
}
-void
-monet4_parse(backend_stack stack, char *cmd)
-{
- backend_parse((Cntxt) stack, cmd);
-}
-
void monet4_set_string(mvc *m, char *name, char *val)
{
Cntxt c = (Cntxt) m->session->stk;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
