Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11746/src/backends/monet5
Modified Files:
sql_result.mx
Log Message:
propagated changes of Friday Aug 17 2007 - Tuesday Aug 21 2007
from the SQL_2-18 branch to the development trunk
There were conflicts in
src/test/leaks/Tests/check0.stable.out.Five
src/test/leaks/Tests/check1.stable.out.Five
src/test/leaks/Tests/check2.stable.out.Five
src/test/leaks/Tests/check3.stable.out.Five
src/test/leaks/Tests/check4.stable.out.Five
src/test/leaks/Tests/check5.stable.out.Five
which I have not attempted to resolve (I didn't change these files).
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sql_result.mx 14 Jul 2007 17:47:57 -0000 1.60
+++ sql_result.mx 21 Aug 2007 12:51:55 -0000 1.61
@@ -496,6 +496,8 @@
if (TABLETload_file(&as, bs, out) >= 0)
bats = TABLETcollect_bats(&as);
}
+ if (as.error)
+ showException(SQL, "sql", as.error);
TABLETdestroy_format(&as);
}
_DELETE(sep);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
