MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

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

Merge with Oct2010 branch.


diffs (11 lines):

diff -r 83008f263fd5 -r 21c59794facd MonetDB4/src/mapi/mapi.mx
--- a/MonetDB4/src/mapi/mapi.mx Fri Oct 29 09:28:20 2010 +0200
+++ b/MonetDB4/src/mapi/mapi.mx Fri Oct 29 10:29:10 2010 +0200
@@ -395,6 +395,7 @@
        mc->engine = f->f_engine;
        mc->frontend = f->nr;
        mc->inuse = 1;
+       mc->c = c;
        mc->t = ~(MT_Id)0;
        MT_init_sema(mc->s, 0, "mapi_client_sema");
        mc->lastvar = monet_cntxt[mc->stk].var;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list