Changeset: 20b09b5e2dc3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20b09b5e2dc3 Modified Files: monetdb5/optimizer/opt_centipede.c Branch: default Log Message:
solve compilation diffs (35 lines): diff --git a/monetdb5/optimizer/opt_centipede.c b/monetdb5/optimizer/opt_centipede.c --- a/monetdb5/optimizer/opt_centipede.c +++ b/monetdb5/optimizer/opt_centipede.c @@ -31,8 +31,8 @@ #include "mal_interpreter.h" #include "algebra.h" -//#define DEBUG_OPT_DETAIL -//#define _DEBUG_OPT_CENTIPEDE_ +#define DEBUG_OPT_DETAIL +#define _DEBUG_OPT_CENTIPEDE_ #define BLOCKED 1 // Instruction should remain in main routine #define PARTITION 2 // Instruction is part of the fragment routine @@ -65,7 +65,7 @@ OPTexecController(Client cntxt, MalBlkPt Symbol s; char nme[BUFSIZ], *plan, *stub; int barrier, x, i, j, k, *alias, nrpack; - InstrPtr p, q, *pack; + InstrPtr p=0, q, *pack; (void) p; /* define the query controller */ @@ -190,10 +190,8 @@ OPTexecController(Client cntxt, MalBlkPt if ( slices->column) { for ( k=0 ; k < nrpack; k++) { /* after packing we may have to re-do groupings*/ - int z; pushInstruction(cmb, pack[k]); - setVarUsed(cmb, z = getArg(pack[k],0)); - //setVarType(cmb,z, newBatType(TYPE_oid,getTailType(getVarType(cmb,z))) ); + setVarUsed(cmb, getArg(pack[k],0)); } } #ifdef _DEBUG_OPT_CENTIPEDE_ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list