Changeset: 117d17a51e0e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=117d17a51e0e
Modified Files:
configure.ag
monetdb5/optimizer/opt_pushselect.c
sql/backends/monet5/rel_bin.c
Branch: default
Log Message:
merging
diffs (26 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -29,7 +29,7 @@ AC_CANONICAL_TARGET
dnl use tar-ustar since we have long (longer than 99 characters) file names
AM_INIT_AUTOMAKE([tar-ustar no-dist-gzip dist-bzip2])
AC_CONFIG_SRCDIR([gdk/gdk.h])
-AM_CONFIG_HEADER([monetdb_config.h])
+AC_CONFIG_HEADERS([monetdb_config.h])
AC_SUBST([CONFIG_H], [monetdb_config.h])
HOST=[$target]
diff --git a/monetdb5/optimizer/opt_pushselect.c
b/monetdb5/optimizer/opt_pushselect.c
--- a/monetdb5/optimizer/opt_pushselect.c
+++ b/monetdb5/optimizer/opt_pushselect.c
@@ -287,7 +287,9 @@ OPTpushselectImplementation(Client cntxt
q = copyInstruction(q);
setFunctionId(q, projectdeltaRef);
getArg(q, 0) = getArg(p, 0);
- p = PushArgument(mb, q, getArg(p, 1),
1);
+ q = PushArgument(mb, q, getArg(p, 1),
1);
+ freeInstruction(p);
+ p = q;
actions++;
}
}
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
