MonetDB: default - fixed merge conflict

[Niels Nes]

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

fixed merge conflict


diffs (33 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
@@ -230,9 +230,6 @@ str userRef;
 str vectorRef;
 str zero_or_oneRef;
 
-int inlineProp;
-int unsafeProp;
-
 void optimizerInit(void)
 {
        assert(batRef == NULL);
@@ -450,8 +447,6 @@ void optimizerInit(void)
        zero_or_oneRef = putName("zero_or_one",11);
        userRef = putName("user",4);
 
-       inlineProp = PropertyIndex("inline");
-       unsafeProp = PropertyIndex("unsafe");
        /*
         * Set the optimizer debugging flag
         */
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
@@ -229,7 +229,4 @@ opt_export  str not_ilikeRef;
 opt_export  str userRef;
 opt_export  str vectorRef;
 opt_export  str zero_or_oneRef;
-
-opt_export int inlineProp;             /* binary */
-opt_export int unsafeProp;             /* binary */
 #endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list