Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23647/src/backends/monet5
Modified Files:
sql_result.mx
Log Message:
fix calls to tablet functions
U sql_result.mx
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- sql_result.mx 4 Aug 2009 21:41:55 -0000 1.118
+++ sql_result.mx 4 Aug 2009 22:08:17 -0000 1.119
@@ -494,10 +494,7 @@
fmt[i].size = ATOMsize(fmt[i].adt);
}
if (TABLETcreate_bats(&as, (BUN) (sz < 0 ? 1000 : sz)) >= 0) {
- if ( getFile(bs->s) == NULL)
- TABLETload_file(&as,bs,out);
- else
- if (SQLload_file(&as, bs, out, sep, rsep, *ssep, sz,
offset) != BUN_NONE)
+ if (( getFile(bs->s) == NULL &&
TABLETload_file(&as,bs,out) != BUN_NONE) || SQLload_file(&as, bs, out, sep,
rsep, *ssep, offset, sz) != BUN_NONE)
bats = TABLETcollect_bats(&as);
}
if (as.error)
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
