MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 244f446bad7c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=244f446bad7c
Modified Files:
        clients/src/mapilib/Mapi.mx
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (15 lines):

diff -r aa6e4d286f04 -r 244f446bad7c clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx       Tue Oct 05 10:22:49 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx       Tue Oct 05 14:02:12 2010 +0200
@@ -1691,9 +1691,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
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list