Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14617/src/server
Modified Files:
sql_parser.mx
Log Message:
propagated changes of Wednesday Dec 19 2007
from the SQL_2-20 branch to the development trunk
Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- sql_parser.mx 13 Dec 2007 16:08:17 -0000 1.265
+++ sql_parser.mx 19 Dec 2007 22:45:57 -0000 1.266
@@ -5049,12 +5049,17 @@
static symbol*
str2atom(sql_allocator *sa, str x)
{
- char *s = sql2str(x);
- int len = _strlen(s);
- sql_subtype t;
+ atom *a = NULL;
- sql_find_subtype(&t, "char", len, 0 );
- return newAtomNode( sa, atom_string(&t, s, 0));
+ if (x) {
+ char *s = sql2str(x);
+ int len = _strlen(s);
+ sql_subtype t;
+
+ sql_find_subtype(&t, "char", len, 0 );
+ a = atom_string(&t, s, 0);
+ }
+ return newAtomNode( sa, a);
}
void *sql_error( mvc * sql, int error_code, char *format, ... )
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
