Changeset: ed71458f0ba9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed71458f0ba9
Added Files:
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.SQL.bat
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.SQL.sh
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.err
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out
sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.sql
sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.err
sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.out
sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.sql
sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.stable.err
sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.stable.out
sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.sql
sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.err
sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.out
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.sql
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/Tests/malcheck.sh
clients/mapilib/Makefile.ag
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
debian/fix-deb.sh
gdk/gdk_atoms.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_calc_compare.h
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_select.c
gdk/gdk_system.c
gdk/gdk_utils.c
gdk/libbat.rc
libversions
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/json.c
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/01_batcalc.mal.sh
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/clients.c
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_matpack.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_support.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/rel_bin.c
sql/backends/monet5/rel_bin.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-plan.stable.out
sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/jdbc/tests/Tests/All
sql/server/rel_select.c
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out.int128
sql/test/copy/Tests/int_parse_best.stable.out
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out
sql/test/remote/Tests/partition_elim.stable.out
testing/Mtest.py.in
vertoo.data
Branch: protocol
Log Message:
Merge with default.
diffs (truncated from 11203 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -637,3 +637,6 @@ 731a25ce40993c0d73ee4fcefb286b9a0a2e0981
f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_11
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
+293b452cd1e5964d820f7d6c538e06507e575d88 Jun2016_13
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
+293b452cd1e5964d820f7d6c538e06507e575d88 Jun2016_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -899,6 +899,17 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Fri Oct 07 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.13-20161007
+- Rebuilt.
+- BZ#4058: Server crashes with a particular conditional query
+- BZ#4064: Assertion: column not found
+- BZ#4067: Relevant column name not printed when a CSV parsing error
+ occurs
+- BZ#4070: Extra condition in join predicate of explicit join produces
+ wrong MAL code
+- BZ#4074: Cannot use prepared statements when caching disabled
+- BZ#6065: CTE with row number and union fails within MAL
+
* Wed Sep 28 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928
- Rebuilt.
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -4967,12 +4967,28 @@ Ready.
[ "batcalc", "lsh_noerror", "pattern
batcalc.lsh_noerror(v:sht,b:bat[:sht],s:bat[:oid]):bat[:sht] ",
"CMDbatLSH;", "Return V << B with candidates list, out of range second
operand causes NIL value" ]
[ "batcalc", "max", "pattern
batcalc.max(b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] ", "CMDbatMAX;",
"Return bat with maximum value of each pair of inputs" ]
[ "batcalc", "max", "pattern
batcalc.max(b1:bat[:any_1],b2:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMAX;", "Return bat with maximum value of each pair of inputs" ]
+[ "batcalc", "max", "pattern batcalc.max(b:bat[:any_1],v:any_1):bat[:any_1]
", "CMDbatMAX;", "Return bat with maximum value of each pair of inputs"
]
+[ "batcalc", "max", "pattern
batcalc.max(b:bat[:any_1],v:any_1,s:bat[:oid]):bat[:any_1] ", "CMDbatMAX;",
"Return bat with maximum value of each pair of inputs" ]
+[ "batcalc", "max", "pattern batcalc.max(v:any_1,b:bat[:any_1]):bat[:any_1]
", "CMDbatMAX;", "Return bat with maximum value of each pair of inputs"
]
+[ "batcalc", "max", "pattern
batcalc.max(v:any_1,b:bat[:any_1],s:bat[:oid]):bat[:any_1] ", "CMDbatMAX;",
"Return bat with maximum value of each pair of inputs" ]
[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(b1:bat[:any_1],b2:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(b:bat[:any_1],v:any_1):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(b:bat[:any_1],v:any_1,s:bat[:oid]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(v:any_1,b:bat[:any_1]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(v:any_1,b:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
[ "batcalc", "min", "pattern
batcalc.min(b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] ", "CMDbatMIN;",
"Return bat with minimum value of each pair of inputs" ]
[ "batcalc", "min", "pattern
batcalc.min(b1:bat[:any_1],b2:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMIN;", "Return bat with minimum value of each pair of inputs" ]
+[ "batcalc", "min", "pattern batcalc.min(b:bat[:any_1],v:any_1):bat[:any_1]
", "CMDbatMIN;", "Return bat with minimum value of each pair of inputs"
]
+[ "batcalc", "min", "pattern
batcalc.min(b:bat[:any_1],v:any_1,s:bat[:oid]):bat[:any_1] ", "CMDbatMIN;",
"Return bat with minimum value of each pair of inputs" ]
+[ "batcalc", "min", "pattern batcalc.min(v:any_1,b:bat[:any_1]):bat[:any_1]
", "CMDbatMIN;", "Return bat with minimum value of each pair of inputs"
]
+[ "batcalc", "min", "pattern
batcalc.min(v:any_1,b:bat[:any_1],s:bat[:oid]):bat[:any_1] ", "CMDbatMIN;",
"Return bat with minimum value of each pair of inputs" ]
[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(b1:bat[:any_1],b2:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(b:bat[:any_1],v:any_1):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(b:bat[:any_1],v:any_1,s:bat[:oid]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(v:any_1,b:bat[:any_1]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(v:any_1,b:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
[ "batcalc", "mod_noerror", "pattern
batcalc.mod_noerror(b1:bat[:bte],b2:bat[:bte]):bat[:bte] ", "CMDbatMOD;",
"Return B1 % B2, divide by zero causes NIL value" ]
[ "batcalc", "mod_noerror", "pattern
batcalc.mod_noerror(b1:bat[:bte],b2:bat[:bte],s:bat[:oid]):bat[:bte] ",
"CMDbatMOD;", "Return B1 % B2 with candidates list, divide by zero causes NIL
value" ]
[ "batcalc", "mod_noerror", "pattern
batcalc.mod_noerror(b1:bat[:bte],b2:bat[:dbl]):bat[:dbl] ", "CMDbatMOD;",
"Return B1 % B2, divide by zero causes NIL value" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -6618,12 +6618,28 @@ Ready.
[ "batcalc", "lsh_noerror", "pattern
batcalc.lsh_noerror(v:sht,b:bat[:sht],s:bat[:oid]):bat[:sht] ",
"CMDbatLSH;", "Return V << B with candidates list, out of range second
operand causes NIL value" ]
[ "batcalc", "max", "pattern
batcalc.max(b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] ", "CMDbatMAX;",
"Return bat with maximum value of each pair of inputs" ]
[ "batcalc", "max", "pattern
batcalc.max(b1:bat[:any_1],b2:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMAX;", "Return bat with maximum value of each pair of inputs" ]
+[ "batcalc", "max", "pattern batcalc.max(b:bat[:any_1],v:any_1):bat[:any_1]
", "CMDbatMAX;", "Return bat with maximum value of each pair of inputs"
]
+[ "batcalc", "max", "pattern
batcalc.max(b:bat[:any_1],v:any_1,s:bat[:oid]):bat[:any_1] ", "CMDbatMAX;",
"Return bat with maximum value of each pair of inputs" ]
+[ "batcalc", "max", "pattern batcalc.max(v:any_1,b:bat[:any_1]):bat[:any_1]
", "CMDbatMAX;", "Return bat with maximum value of each pair of inputs"
]
+[ "batcalc", "max", "pattern
batcalc.max(v:any_1,b:bat[:any_1],s:bat[:oid]):bat[:any_1] ", "CMDbatMAX;",
"Return bat with maximum value of each pair of inputs" ]
[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(b1:bat[:any_1],b2:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(b:bat[:any_1],v:any_1):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(b:bat[:any_1],v:any_1,s:bat[:oid]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(v:any_1,b:bat[:any_1]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "max_no_nil", "pattern
batcalc.max_no_nil(v:any_1,b:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMAX_no_nil;", "Return bat with maximum value of each pair of inputs,
ignoring nil values" ]
[ "batcalc", "min", "pattern
batcalc.min(b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] ", "CMDbatMIN;",
"Return bat with minimum value of each pair of inputs" ]
[ "batcalc", "min", "pattern
batcalc.min(b1:bat[:any_1],b2:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMIN;", "Return bat with minimum value of each pair of inputs" ]
+[ "batcalc", "min", "pattern batcalc.min(b:bat[:any_1],v:any_1):bat[:any_1]
", "CMDbatMIN;", "Return bat with minimum value of each pair of inputs"
]
+[ "batcalc", "min", "pattern
batcalc.min(b:bat[:any_1],v:any_1,s:bat[:oid]):bat[:any_1] ", "CMDbatMIN;",
"Return bat with minimum value of each pair of inputs" ]
+[ "batcalc", "min", "pattern batcalc.min(v:any_1,b:bat[:any_1]):bat[:any_1]
", "CMDbatMIN;", "Return bat with minimum value of each pair of inputs"
]
+[ "batcalc", "min", "pattern
batcalc.min(v:any_1,b:bat[:any_1],s:bat[:oid]):bat[:any_1] ", "CMDbatMIN;",
"Return bat with minimum value of each pair of inputs" ]
[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(b1:bat[:any_1],b2:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(b:bat[:any_1],v:any_1):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(b:bat[:any_1],v:any_1,s:bat[:oid]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(v:any_1,b:bat[:any_1]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
+[ "batcalc", "min_no_nil", "pattern
batcalc.min_no_nil(v:any_1,b:bat[:any_1],s:bat[:oid]):bat[:any_1] ",
"CMDbatMIN_no_nil;", "Return bat with minimum value of each pair of inputs,
ignoring nil values" ]
[ "batcalc", "mod_noerror", "pattern
batcalc.mod_noerror(b1:bat[:bte],b2:bat[:bte]):bat[:bte] ", "CMDbatMOD;",
"Return B1 % B2, divide by zero causes NIL value" ]
[ "batcalc", "mod_noerror", "pattern
batcalc.mod_noerror(b1:bat[:bte],b2:bat[:bte],s:bat[:oid]):bat[:bte] ",
"CMDbatMOD;", "Return B1 % B2 with candidates list, divide by zero causes NIL
value" ]
[ "batcalc", "mod_noerror", "pattern
batcalc.mod_noerror(b1:bat[:bte],b2:bat[:dbl]):bat[:dbl] ", "CMDbatMOD;",
"Return B1 % B2, divide by zero causes NIL value" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -46,6 +46,10 @@ BAT *BATcalccstgt(const ValRecord *v, BA
BAT *BATcalccstle(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstlsh(const ValRecord *v, BAT *b, BAT *s, int abort_on_error);
BAT *BATcalccstlt(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstmax(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstmax_no_nil(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstmin(const ValRecord *v, BAT *b, BAT *s);
+BAT *BATcalccstmin_no_nil(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstmod(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
BAT *BATcalccstmul(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
BAT *BATcalccstne(const ValRecord *v, BAT *b, BAT *s);
@@ -78,8 +82,12 @@ BAT *BATcalclt(BAT *b1, BAT *b2, BAT *s)
BAT *BATcalcltcst(BAT *b, const ValRecord *v, BAT *s);
BAT *BATcalcmax(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcmax_no_nil(BAT *b1, BAT *b2, BAT *s);
+BAT *BATcalcmaxcst(BAT *b, const ValRecord *v, BAT *s);
+BAT *BATcalcmaxcst_no_nil(BAT *b, const ValRecord *v, BAT *s);
BAT *BATcalcmin(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT *s);
+BAT *BATcalcmincst(BAT *b, const ValRecord *v, BAT *s);
+BAT *BATcalcmincst_no_nil(BAT *b, const ValRecord *v, BAT *s);
BAT *BATcalcmod(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
BAT *BATcalcmodcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
BAT *BATcalcmul(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
diff --git a/clients/Tests/malcheck.sh b/clients/Tests/malcheck.sh
--- a/clients/Tests/malcheck.sh
+++ b/clients/Tests/malcheck.sh
@@ -1,3 +1,3 @@
#!/bin/sh
cd $TSTSRCBASE
-hg files -I '{monetdb5,sql,geom}/**.{[ch],mal}' -X '**/Tests/**' | python -c
'import MonetDBtesting.malcheck'
+hg -q files -I '{monetdb5,sql,geom}/**.{[ch],mal}' -X '**/Tests/**' | python
-c 'import MonetDBtesting.malcheck'
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -7,7 +7,7 @@
MTSAFE
INCLUDES = ../../common/options ../../common/stream ../../common/utils \
- $(MSGCONTROL_FLAGS)
+ $(MSGCONTROL_FLAGS) $(openssl_CFLAGS)
lib_mapi = {
VERSION = $(MAPI_VERSION)
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1937,16 +1937,20 @@ AS_VAR_IF([enable_pyintegration], [no],
enable_pyintegration=yes],
[AC_MSG_ERROR([--enable-pyintegration value must be
yes|no|auto|absolute path of python-config])])
AS_VAR_IF([have_pyconfig], [], [
- AC_PATH_PROG([PYCMD], [python-config], [no], [$PATH])
- AS_VAR_IF([PYCMD], [],
- [AS_VAR_IF([enable_pyintegration], [yes],
+ AC_PATH_PROG([PYCMD], [python2-config], [no], [$PATH])
+ AS_VAR_IF([PYCMD], [no], [
+ AC_PATH_PROG([PYCMD2], [python-config], [no], [$PATH])
+ AS_VAR_IF([PYCMD2], [no], [
+ AS_VAR_IF([enable_pyintegration], [yes],
[AC_MSG_ERROR([python-config library required
for Python integration support])],
[have_libpy="no"
why_have_libpy="(python-config command not
found)"
- enable_pyintegration=no
- disable_pyintegration="(python-config command
not found)"])])],
- [PYCMD="$have_pyconfig"])
-
+ enable_pyintegration="no"
+ disable_pyintegration="(python-config command
not found)"
+ ])
+ ], [PYCMD="$PYCMD2"])
+ ], [])
+ ], [PYCMD="$have_pyconfig"])
AS_VAR_IF([have_pyversion], [],
[PYTHON_CMD=$PYTHON2],
[PYTHON_CMD=$have_pyversion])
@@ -1962,14 +1966,14 @@ AS_VAR_IF([enable_pyintegration], [no],
[AC_MSG_ERROR([numpy version >= 1.7.0 required for
Python integration support])],
[have_libpy="no"
why_have_libpy="(numpy version >= 1.7.0 not found)"
- enable_pyintegration=no
+ enable_pyintegration="no"
disable_pyintegration="(numpy version >= 1.7.0 not
found)"])],
[test "x$NUMPYHEADERS" = xFalse ],
[AS_VAR_IF([enable_pyintegration], [yes],
[AC_MSG_ERROR([numpy/arrayobject.h not found])],
[have_libpy="no"
why_have_libpy="(numpy/arrayobject.h not found)"
- enable_pyintegration=no
+ enable_pyintegration="no"
disable_pyintegration="(numpy/arrayobject.h not
found)"])],
[libpy_CFLAGS=`$PYTHON_CMD -c "from distutils.sysconfig import
get_python_inc; import numpy; print(' -I' + get_python_inc() + ' -I' +
numpy.get_include());"`
libpy_LIBS=`$PYCMD --ldflags`
@@ -1983,7 +1987,7 @@ AS_VAR_IF([enable_pyintegration], [no],
[AC_MSG_ERROR([Python.h not found])],
[have_libpy="no"
why_have_libpy="Python.h not found"
- enable_pyintegration=no
+ enable_pyintegration="no"
disable_pyintegration="Python.h not
found"])])])])
AM_CONDITIONAL([HAVE_LIBPY], [test x"$have_libpy" != xno])
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.23.13) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#4058: Server crashes with a particular conditional query
+ * BZ#4064: Assertion: column not found
+ * BZ#4067: Relevant column name not printed when a CSV parsing error
+ occurs
+ * BZ#4070: Extra condition in join predicate of explicit join produces
+ wrong MAL code
+ * BZ#4074: Cannot use prepared statements when caching disabled
+ * BZ#6065: CTE with row number and union fails within MAL
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 07 Oct 2016 11:01:07 +0200
+
monetdb (11.23.11) unstable; urgency=low
* Rebuilt.
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -48,8 +48,8 @@ esac
case $SUITE in
wheezy | jessie | precise | trusty | wily)
- # Xenial Xerus (and presumably newer releases) uses php-common,
- # all others still have php5-common
- sed -i 's/php-common/php5-common/' debian/control
+ # Xenial Xerus (and presumably newer releases) uses php-cli,
+ # all others still have php5-cli and don't have php*-sockets
+ sed -i 's/php-cli/php5-cli/;s/, *php-sockets//' debian/control
;;
esac
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -492,7 +492,8 @@ bitToStr(char **dst, int *len, const bit
static bit *
bitRead(bit *a, stream *s, size_t cnt)
{
- mnstr_read(s, (char *) a, 1, cnt);
+ if (mnstr_read(s, (char *) a, 1, cnt) < 0)
+ return NULL;
return mnstr_errnr(s) ? NULL : a;
}
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -60,11 +60,9 @@
static gdk_return
checkbats(BAT *b1, BAT *b2, const char *func)
{
- if (b2 != NULL) {
- if (b1->batCount != b2->batCount) {
- GDKerror("%s: inputs not the same size.\n", func);
- return GDK_FAIL;
- }
+ if (b1->batCount != b2->batCount) {
+ GDKerror("%s: inputs not the same size.\n", func);
+ return GDK_FAIL;
}
return GDK_SUCCEED;
}
@@ -196,8 +194,6 @@ BATcalcnot(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcnot", NULL);
- if (checkbats(b, NULL, "BATcalcnot") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, b->ttype, cnt, TRANSIENT);
@@ -315,8 +311,6 @@ BATcalcnegate(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcnegate", NULL);
- if (checkbats(b, NULL, "BATcalcnegate") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, b->ttype, cnt, TRANSIENT);
@@ -444,8 +438,6 @@ BATcalcabsolute(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcabsolute", NULL);
- if (checkbats(b, NULL, "BATcalcabsolute") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, b->ttype, cnt, TRANSIENT);
@@ -577,8 +569,6 @@ BATcalciszero(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalciszero", NULL);
- if (checkbats(b, NULL, "BATcalciszero") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
