Changeset: 556a02d2874a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=556a02d2874a
Added Files:
monetdb5/modules/mal/Tests/clients-hashes.stable.out.Darwin
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
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
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jun2016
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/Tests/malcheck.sh
clients/mapilib/mapi.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/stream.c
common/utils/mcrypt.c
common/utils/mcrypt.h
configure.ag
debian/changelog
debian/fix-deb.sh
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_calc_compare.h
gdk/gdk_heap.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_utils.c
gdk/libbat.rc
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
libversions
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/Makefile.ag
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/01_batcalc.mal.sh
monetdb5/modules/mal/Tests/clients-hashes.malC
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/tablet.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/sql_scenario.c
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-plan.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
sql/benchmarks/tpch/Tests/14.stable.out
sql/benchmarks/tpch/Tests/14.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/server/rel_optimizer.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.stable.out
sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err
sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err
sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/median_stdev.stable.out
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/int_parse_best.stable.out
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out
sql/test/copy/Tests/null_as_string_errors.stable.err
sql/test/copy/Tests/null_as_string_errors.stable.out
sql/test/pg_regress/Tests/int2.stable.out
sql/test/remote/Tests/partition_elim.stable.out
testing/Mtest.py.in
tools/mserver/mserver5.c
vertoo.data
Branch: mosaic
Log Message:
merge with default
diffs (truncated from 5989 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -634,3 +634,6 @@ 4a05df3932a97865ac7e4037361723d5563490b3
c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_SP1_release
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_9
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_11
+731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -899,6 +899,13 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Wed Sep 28 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928
+- Rebuilt.
+
+* Mon Sep 26 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928
+- buildtools: We now use the CommonCrypto library instead of the OpenSSL
library
+ on Darwin.
+
* Mon Sep 19 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.9-20160919
- Rebuilt.
- BZ#3939: Assert failure on concurrent queries when querying sys.queue
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -345,9 +345,6 @@
/* Define to 1 if you have the `mallopt' function. */
/* #undef HAVE_MALLOPT */
-/* Define to 1 if you have the `MD5_Update' function. */
-#define HAVE_MD5_UPDATE 1
-
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
@@ -430,9 +427,6 @@
/* Define if the compiler supports the restrict keyword */
/* #undef HAVE_RESTRICT */
-/* Define to 1 if you have the `RIPEMD160_Update' function. */
-#define HAVE_RIPEMD160_UPDATE 1
-
/* Define to 1 if you have the `round' function. */
#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_ROUND 1
@@ -459,6 +453,13 @@
/* Define to 1 if you have the `setsid' function. */
/* #undef HAVE_SETSID */
+#ifdef HAVE_OPENSSL
+/* Define to 1 if you have the `MD5_Update' function. */
+#define HAVE_MD5_UPDATE 1
+
+/* Define to 1 if you have the `RIPEMD160_Update' function. */
+#define HAVE_RIPEMD160_UPDATE 1
+
/* Define to 1 if you have the `SHA1_Update' function. */
#define HAVE_SHA1_UPDATE 1
@@ -473,6 +474,7 @@
/* Define to 1 if you have the `SHA512_Update' function. */
#define HAVE_SHA512_UPDATE 1
+#endif
/* Define to 1 if you have the `shutdown' function. */
#define HAVE_SHUTDOWN 1
@@ -749,6 +751,7 @@
/* The used password hash algorithm */
#define MONETDB5_PASSWDHASH "SHA512"
+#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
#define MONETDB_RELEASE "unreleased"
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Sep 26 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928
+- We now use the CommonCrypto library instead of the OpenSSL library
+ on Darwin.
+
* Fri Feb 26 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.1-20160601
- A new package MonetDB-lidar (Fedora) or libmonetdb5-server-lidar
(Debian/Ubuntu) has been created to work with LiDAR data.
diff --git a/buildtools/ChangeLog.Jun2016 b/buildtools/ChangeLog.Jun2016
--- a/buildtools/ChangeLog.Jun2016
+++ b/buildtools/ChangeLog.Jun2016
@@ -1,7 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Mon Sep 26 2016 Sjoerd Mullender <sjo...@acm.org>
-- We now use the CommonCrypto library instead of the OpenSSL library
- on Darwin.
-
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/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -959,7 +959,7 @@ struct MapiStatement {
#endif
#ifdef HAVE_EMBEDDED
-#define printf //
+#define printf(...) ((void)0)
#endif
/*
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
VALUE "InternalName", "Mapi\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2015\0"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2016\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
VALUE "InternalName", "libMonetODBC\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2015\0"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2016\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -598,8 +598,10 @@ void
close_stream(stream *s)
{
if (s) {
- s->close(s);
- s->destroy(s);
+ if (s->close)
+ s->close(s);
+ if (s->destroy)
+ s->destroy(s);
}
}
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -13,16 +13,19 @@
#include "mcrypt.h"
#include <string.h>
-#if defined(HAVE_OPENSSL) || defined(HAVE_COMMONCRYPTO)
-
+#ifndef HAVE_EMBEDDED
+/* only provide digest functions if not embedded */
#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
#include <openssl/sha.h>
#include <openssl/ripemd.h>
#else
+#ifdef HAVE_COMMONCRYPTO
#define COMMON_DIGEST_FOR_OPENSSL
#include <CommonCrypto/CommonDigest.h>
#endif
+#endif
+#endif
/**
* Returns a comma separated list of supported hash algorithms suitable
@@ -40,8 +43,8 @@ mcrypt_getHashAlgorithms(void)
* Better/stronger/faster algorithms can be added in the future upon
* desire.
*/
-#if defined(HAVE_RIPEMD160_UPDATE) || defined(HAVE_SHA256_UPDATE) ||
defined(HAVE_SHA1_UPDATE) || defined(HAVE_MD5_UPDATE)
- return strdup(
+#if !defined(HAVE_EMBEDDED) && (defined(HAVE_RIPEMD160_UPDATE) ||
defined(HAVE_SHA256_UPDATE) || defined(HAVE_SHA1_UPDATE) ||
defined(HAVE_MD5_UPDATE))
+ const char *algorithms =
#ifdef HAVE_RIPEMD160_UPDATE
"RIPEMD160"
#endif
@@ -63,7 +66,8 @@ mcrypt_getHashAlgorithms(void)
#endif
"MD5"
#endif
- );
+ ;
+ return strdup(algorithms);
#else
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
