MonetDB: default - Merge heads.

[Sjoerd Mullender]

Changeset: 66b995176e04 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66b995176e04
Modified Files:
        
Branch: default
Log Message:

Merge heads.


diffs (14 lines):

diff -r 12af2dadd89b -r 66b995176e04 MonetDB5/src/mal/mal_session.mx
--- a/MonetDB5/src/mal/mal_session.mx   Tue Sep 07 14:00:42 2010 +0200
+++ b/MonetDB5/src/mal/mal_session.mx   Tue Sep 07 16:28:14 2010 +0200
@@ -475,8 +475,10 @@
                                        break;
                                resetScenario(c);
                        } while (c->scenario);
+#ifdef BUG_2581675_FIXED               /* when client record reinitialized 
properly, this code can be reinstated */
                        if (!MCwait(c))
                                break;
+#endif
                } while(c->scenario && c->mode != FINISHING);
        }
 @-
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list