Update of /cvsroot/monetdb/sql/src/server
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10745/sql/src/server
Modified Files:
Tag: Feb2010
sql_atom.mx
Log Message:
Accept that ATOMfromstr returns 0 so that we can parse empty BLOBs.
Errors in ATOMfromstr are usually indicated by a return of 0, but in that case
the value is nil which is still caught.
Approve test output that was actually approved incorrectly before.
Index: sql_atom.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_atom.mx,v
retrieving revision 1.70
retrieving revision 1.70.2.1
diff -u -d -r1.70 -r1.70.2.1
--- sql_atom.mx 10 Jan 2010 15:33:34 -0000 1.70
+++ sql_atom.mx 16 Feb 2010 15:20:40 -0000 1.70.2.1
@@ -267,7 +267,7 @@
int res = ATOMfromstr(type, &p, &a->data.len, val);
/* no result or nil means error (SQL has NULL not nil)
*/
- if (res <= 0 || !p || ATOMcmp(type, p,
ATOMnilptr(type)) == 0) {
+ if (res < 0 || !p || ATOMcmp(type, p, ATOMnilptr(type))
== 0) {
/*_DELETE(val);*/
_DELETE(a);
if (p)
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
