Changeset: d3f96981fbb6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3f96981fbb6
Modified Files:
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: Aug2018
Log Message:
Merged with Mar2018 branch.
diffs (74 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
@@ -515,14 +515,14 @@ void optimizerInit(void)
queryRef = putName("query");
rapiRef = putName("rapi");
batrapiRef = putName("batrapi");
- pyapiRef = putName("pyapi");
- batpyapiRef = putName("batpyapi");
- capiRef = putName("capi");
- batcapiRef = putName("batcapi");
- pyapimapRef = putName("batpyapimap");
- pyapi3Ref = putName("pyapi3");
- batpyapi3Ref = putName("batpyapi3");
- pyapi3mapRef = putName("batpyapi3map");
+ pyapiRef = putName("pyapi");
+ batpyapiRef = putName("batpyapi");
+ capiRef = putName("capi");
+ batcapiRef = putName("batcapi");
+ pyapimapRef = putName("batpyapimap");
+ pyapi3Ref = putName("pyapi3");
+ batpyapi3Ref = putName("batpyapi3");
+ pyapi3mapRef = putName("batpyapi3map");
subeval_aggrRef = putName("subeval_aggr");
rankRef = putName("rank");
dense_rankRef = putName("dense_rank");
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
@@ -33,7 +33,7 @@ mal_export str alter_triggerRef;
mal_export str alter_typeRef;
mal_export str alter_userRef;
mal_export str alter_viewRef;
-mal_export str andRef;
+mal_export str andRef;
mal_export str antijoinRef;
mal_export str appendidxRef;
mal_export str appendRef;
@@ -112,7 +112,7 @@ mal_export str drop_triggerRef;
mal_export str drop_typeRef;
mal_export str drop_userRef;
mal_export str drop_viewRef;
-mal_export str emptybindidxRef;
+mal_export str emptybindidxRef;
mal_export str emptybindRef;
mal_export str eqRef;
mal_export str evalRef;
@@ -229,7 +229,7 @@ mal_export str pyapi3mapRef;
mal_export str subeval_aggrRef;
mal_export str rankRef;
mal_export str dense_rankRef;
-mal_export str raiseRef;
+mal_export str raiseRef;
mal_export str rangejoinRef;
mal_export str rankRef;
mal_export str rapiRef;
@@ -296,12 +296,12 @@ mal_export str thetajoinRef;
mal_export str thetaselectRef;
mal_export str tidRef;
mal_export str timestampRef;
-mal_export str transaction_abortRef;
-mal_export str transaction_beginRef;
-mal_export str transaction_commitRef;
+mal_export str transaction_abortRef;
+mal_export str transaction_beginRef;
+mal_export str transaction_commitRef;
mal_export str transactionRef;
-mal_export str transaction_releaseRef;
-mal_export str transaction_rollbackRef;
+mal_export str transaction_releaseRef;
+mal_export str transaction_rollbackRef;
mal_export str uniqueRef;
mal_export str unlockRef;
mal_export str unpackRef;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
