Changeset: 3025666bff71 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3025666bff71
Modified Files:
clients/src/mapilib/Mapi.mx
Branch: Oct2010
Log Message:
Backed out changeset defe1152cfbb
The "logic error" was not a logic error but was carefully thought
out. I.e. we get very bogus results in normal processing with the
change. With the change, it can happen that an Xclose command is sent
in the middle of a SQL query.
diffs (15 lines):
diff -r defe1152cfbb -r 3025666bff71 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Wed Aug 18 11:00:33 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Oct 05 13:39:43 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
