MonetDB: sciql - Merge with default

[mk]

Changeset: d9e4cdb4d1c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9e4cdb4d1c7
Modified Files:
        MonetDB5/src/optimizer/opt_mitosis.mx
Branch: sciql
Log Message:

Merge with default


diffs (20 lines):

diff -r a216f4b2aa82 -r d9e4cdb4d1c7 MonetDB5/src/optimizer/opt_mitosis.mx
--- a/MonetDB5/src/optimizer/opt_mitosis.mx     Sat Nov 27 10:39:14 2010 +0100
+++ b/MonetDB5/src/optimizer/opt_mitosis.mx     Sat Nov 27 10:44:52 2010 +0100
@@ -68,6 +68,7 @@
 #include "mal_config.h"
 #include "opt_mitosis.h"
 #include "opt_octopus.h"
+#include "opt_tarantula.h"
 #include "mal_interpreter.h"
 
 #define PARTITION_THRESHOLD (wrd) threads      /* should be increased in 
production version */
@@ -99,6 +100,8 @@
        InstrPtr q,*old, target= 0, matq;
        size_t typewidth= 3 *sizeof(lng); /* 2 arguments and a result */
        int threads = GDKnr_threads ? GDKnr_threads:1;
+       ValRecord vr;
+       VarPtr loc,rows;
 
        (void)cntxt;
        (void) stk;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list