Changeset: b60934ca3f0b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b60934ca3f0b
Modified Files:
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/mal/Makefile.ag
sql/server/rel_optimizer.c
tools/merovingian/utils/Makefile.ag
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (63 lines):
diff --git a/monetdb5/modules/atoms/Makefile.ag
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -20,7 +20,7 @@ INCLUDES = ../../mal \
../../../common/stream \
../../../common/utils \
../../../gdk \
- $(libxml2_CFLAGS) $(curl_CFLAGS)
+ $(libxml2_CFLAGS) $(curl_CFLAGS) $(openssl_CFLAGS)
MTSAFE
lib_atoms = {
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -21,7 +21,8 @@ INCLUDES = ../../mal ../atoms ../kernel
../../../common/stream \
../../../common/utils \
../../../gdk \
- $(pcre_CFLAGS) $(zlib_CFLAGS) $(BZIP_INCS) $(MSGCONTROL_FLAGS)
+ $(pcre_CFLAGS) $(zlib_CFLAGS) $(BZIP_INCS) $(MSGCONTROL_FLAGS) \
+ $(openssl_CFLAGS)
MTSAFE
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -3122,19 +3122,18 @@ rel_push_groupby_down(int *changes, mvc
if (rel->op == op_groupby && list_length(gbe) == 1 && is_join(j->op)) {
sql_rel *jl = j->l, *jr = j->r, *cr;
sql_exp *gb = gbe->h->data, *e;
- prop *p;
node *n;
int left = 1;
list *aggrs, *gbe;
if (jl->op == op_project &&
(e = list_find_exp( jl->exps, gb)) != NULL &&
- (p = find_prop(e->p, PROP_HASHCOL)) != NULL) {
+ find_prop(e->p, PROP_HASHCOL) != NULL) {
left = 0;
cr = jr;
} else if (jr->op == op_project &&
(e = list_find_exp( jr->exps, gb)) != NULL &&
- (p = find_prop(e->p, PROP_HASHCOL)) != NULL) {
+ find_prop(e->p, PROP_HASHCOL) != NULL) {
left = 1;
cr = jl;
} else {
diff --git a/tools/merovingian/utils/Makefile.ag
b/tools/merovingian/utils/Makefile.ag
--- a/tools/merovingian/utils/Makefile.ag
+++ b/tools/merovingian/utils/Makefile.ag
@@ -17,7 +17,8 @@
INCLUDES = ../../../common/stream \
../../../common/options \
- ../../../common/utils
+ ../../../common/utils \
+ $(openssl_CFLAGS)
lib_meroutil = {
NOINST
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
