Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17858/src/backends/monet4
Modified Files:
Makefile.ag sql_server.mx
Log Message:
propagated changes of Thursday Nov 15 2007 - Saturday Nov 17 2007
from the SQL_2-20 branch to the development trunk
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/Makefile.ag,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile.ag 8 Nov 2007 19:35:15 -0000 1.41
+++ Makefile.ag 17 Nov 2007 16:32:55 -0000 1.42
@@ -122,7 +122,6 @@
PREFIX =
NAME = _monetdb
SOURCES = monetdb.py.i
- #LIBS = libembeddedsql $(PYTHON_LIBS) $(MONETDB_LIBS) -lmutils -lstream
$(CLIENTS_LIBS) -lMapi
LIBS = libinitmodules STATIC_MODS @SHARED_LIBS@ lib_sql_server
$(EXTRA_LIBS) \
libembeddedsql \
$(MONETDB_LIBS) -lbat -lmutils -lstream $(MONETDB4_LIBS)
-lmonet $(CLIENTS_LIBS) -lMapi $(PYTHON_LIBS)
Index: sql_server.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_server.mx,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- sql_server.mx 6 Nov 2007 15:35:38 -0000 1.178
+++ sql_server.mx 17 Nov 2007 16:32:55 -0000 1.179
@@ -890,8 +890,13 @@
lng value = 0;
if (!dot) {
- GDKerror("\"%s\" is no decimal value (doesn't contain a '.')",
val);
- return GDK_FAIL;
+ if (GDK_STRNIL(val)) {
+ *res = @1_nil;
+ return GDK_SUCCEED;
+ } else {
+ GDKerror("\"%s\" is no decimal value (doesn't contain a
'.')", val);
+ return GDK_FAIL;
+ }
}
value = decimal_from_str(s);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
