Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1701/src/backends/monet5
Modified Files:
sql.mx sql_scenario.mx
Log Message:
propagated changes of Tuesday Feb 20 2007 - Wednesday Feb 21 2007
from the SQL_2-16 branch to the development trunk
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- sql_scenario.mx 20 Feb 2007 16:58:15 -0000 1.251
+++ sql_scenario.mx 21 Feb 2007 14:00:46 -0000 1.252
@@ -90,23 +90,14 @@
static void
monet5_freestack(backend_stack stk)
{
- (void) stk;
+ if (stk)
+ GDKfree(stk);
#ifdef _SQL_SCENARIO_DEBUG
stream_printf(GDKout, "#monet5_freestack\n");
#endif
}
static void
-monet5_parse(backend_stack stk, char *cmd)
-{
- (void) stk;
- (void) cmd;
-#ifdef _SQL_SCENARIO_DEBUG
- stream_printf(GDKout, "#monet5_parse:%s\n", cmd);
-#endif
-}
-
-static void
monet5_freecode(backend_code code, backend_stack stk, int nr, char *name)
{
int ret = 0;
@@ -219,7 +210,6 @@
be_funcs = GDKzalloc(sizeof(backend_functions));
be_funcs->fstack = &monet5_freestack;
be_funcs->fcode = &monet5_freecode;
- be_funcs->finterpret = &monet5_parse;
monet5_user_init(be_funcs);
backend_init(be_funcs); /* be_funcs probably leaks */
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- sql.mx 20 Feb 2007 12:52:15 -0000 1.211
+++ sql.mx 21 Feb 2007 14:00:46 -0000 1.212
@@ -1849,7 +1849,7 @@
int tpe = getArgType(mb, pci, 5);
int len = *(int *) getArgReference(stk, pci, 6);
int sz = len + 1;
- char *r = GDKmalloc(sz);
+ char *r = NULL;
mvc *m = NULL;
str msg = getContext(&m, NULL);
@@ -1865,7 +1865,8 @@
r = GDKstrdup(v);
}
if (len > 0 && sz > len) {
- GDKfree(r);
+ if (r)
+ GDKfree(r);
if (ATOMcmp(TYPE_str, ATOMnilptr(TYPE_str), p) != 0) {
throw(SQL, "str_cast", "value too long for type
(var)char(%d)", len);
} else {
-------------------------------------------------------------------------
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
