Changeset: 568609ab1ce1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=568609ab1ce1
Modified Files:
Branch: Oct2010
Log Message:
Merge heads.
diffs (15 lines):
diff -r f0c52696e661 -r 568609ab1ce1 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Oct 05 09:47:22 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Oct 05 14:01:57 2010 +0200
@@ -1693,9 +1693,8 @@
assert(hdl->npending_close == 0 ||
(hdl->npending_close > 0 && hdl->pending_close != NULL));
if (mid->active &&
- mid->active->active != result &&
- result->cache.tuplecount < result->row_count)
- {
+ (mid->active->active != result ||
+ result->cache.tuplecount < result->row_count)) {
/* can't write "X" commands now, so save for later */
REALLOC(hdl->pending_close, hdl->npending_close + 1);
hdl->pending_close[hdl->npending_close] =
result->tableid;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
