MonetDB: mutation - merge with default.

[Martin Kersten]

Changeset: 0f877078a262 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f877078a262
Modified Files:
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
Branch: mutation
Log Message:

merge with default.


diffs (30 lines):

diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -86,6 +86,7 @@ str tintersectRef;
 str tdiffRef;
 str tinterRef;
 str mergecandRef;
+str mergepack;
 str intersectcandRef;
 str eqRef;
 str disconnectRef;
@@ -355,6 +356,7 @@ void optimizerInit(void){
                tdiffRef= putName("tdiff",5);
                tinterRef= putName("tinter",6);
                mergecandRef= putName("mergecand",9);
+               mergepack= putName("mergepack",9);
                intersectcandRef= putName("intersectcand",13);
                eqRef = putName("==",2);
                disconnectRef= putName("disconnect",10);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -85,6 +85,7 @@ opt_export  str tintersectRef;
 opt_export  str tdiffRef;
 opt_export  str tinterRef;
 opt_export  str mergecandRef;
+opt_export  str mergepackRef;
 opt_export  str intersectcandRef;
 opt_export  str eqRef;
 opt_export  str disconnectRef;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list