Changeset: bd7f63dd81de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd7f63dd81de
Added Files:
buildtools/ChangeLog.Oct2014
clients/ChangeLog.Oct2014
clients/Tests/MAL-signatures_R.malC.src
clients/Tests/MAL-signatures_R.stable.err
clients/Tests/MAL-signatures_R.stable.out
clients/mapilib/ChangeLog.Oct2014
clients/python2/ChangeLog.Oct2014
clients/python3/ChangeLog.Oct2014
common/stream/ChangeLog.Oct2014
gdk/ChangeLog.Oct2014
geom/ChangeLog.Oct2014
java/ChangeLog.Oct2014
monetdb5/ChangeLog.Oct2014
monetdb5/extras/rapi/50_rapi.mal
monetdb5/extras/rapi/Makefile.ag
monetdb5/extras/rapi/Tests/All
monetdb5/extras/rapi/Tests/rapi00.malC
monetdb5/extras/rapi/Tests/rapi00.stable.err
monetdb5/extras/rapi/Tests/rapi00.stable.out
monetdb5/extras/rapi/Tests/rapi01.malC
monetdb5/extras/rapi/Tests/rapi01.stable.err
monetdb5/extras/rapi/Tests/rapi01.stable.out
monetdb5/extras/rapi/Tests/rapi02.malC
monetdb5/extras/rapi/Tests/rapi02.stable.err
monetdb5/extras/rapi/Tests/rapi02.stable.out
monetdb5/extras/rapi/Tests/rapi03.malC
monetdb5/extras/rapi/Tests/rapi03.stable.err
monetdb5/extras/rapi/Tests/rapi03.stable.out
monetdb5/extras/rapi/Tests/rapi04.malC
monetdb5/extras/rapi/Tests/rapi04.stable.err
monetdb5/extras/rapi/Tests/rapi04.stable.out
monetdb5/extras/rapi/Tests/rapi05.malC
monetdb5/extras/rapi/Tests/rapi05.stable.err
monetdb5/extras/rapi/Tests/rapi05.stable.out
monetdb5/extras/rapi/Tests/rapi06.malC
monetdb5/extras/rapi/Tests/rapi06.stable.err
monetdb5/extras/rapi/Tests/rapi06.stable.out
monetdb5/extras/rapi/Tests/rapi07.malC
monetdb5/extras/rapi/Tests/rapi08.malC
monetdb5/extras/rapi/rapi.R
monetdb5/extras/rapi/rapi.c
monetdb5/extras/rapi/rapi.h
monetdb5/extras/rapi/rapi.mal
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_generator.h
monetdb5/tests/gdkTests/Tests/between.mal
monetdb5/tests/gdkTests/Tests/between.stable.err
monetdb5/tests/gdkTests/Tests/between.stable.out
sql/ChangeLog.Oct2014
sql/backends/monet5/Tests/inlineUDF.sql
sql/backends/monet5/Tests/rapi00.sql
sql/backends/monet5/Tests/rapi00.stable.err
sql/backends/monet5/Tests/rapi00.stable.out
sql/backends/monet5/Tests/rapi01.sql
sql/backends/monet5/Tests/rapi01.stable.err
sql/backends/monet5/Tests/rapi01.stable.out
sql/backends/monet5/Tests/rapi02.sql
sql/backends/monet5/Tests/rapi02.stable.err
sql/backends/monet5/Tests/rapi02.stable.out
sql/backends/monet5/Tests/rapi03.sql
sql/backends/monet5/Tests/rapi03.stable.err
sql/backends/monet5/Tests/rapi03.stable.out
sql/backends/monet5/Tests/rapi04.sql
sql/backends/monet5/Tests/rapi04.stable.err
sql/backends/monet5/Tests/rapi04.stable.out
sql/backends/monet5/Tests/rapi05.sql
sql/backends/monet5/Tests/rapi05.stable.err
sql/backends/monet5/Tests/rapi05.stable.out
sql/backends/monet5/Tests/rapi06.sql
sql/backends/monet5/Tests/rapi06.stable.err
sql/backends/monet5/Tests/rapi06.stable.out
sql/backends/monet5/Tests/rapi07.sql
sql/backends/monet5/Tests/rapi07.stable.err
sql/backends/monet5/Tests/rapi07.stable.out
sql/backends/monet5/Tests/rapi08.sql
sql/backends/monet5/Tests/rapi09.sql
sql/backends/monet5/Tests/rapi09.stable.err
sql/backends/monet5/Tests/rapi09.stable.out
sql/backends/monet5/Tests/rapi10.sql
sql/backends/monet5/Tests/rapi10.stable.err
sql/backends/monet5/Tests/rapi10.stable.out
sql/backends/monet5/Tests/rapi11.sql
sql/backends/monet5/generator/90_generator.mal
sql/backends/monet5/generator/90_generator.sql
sql/backends/monet5/generator/Makefile.ag
sql/backends/monet5/generator/Tests/All
sql/backends/monet5/generator/Tests/generator00.sql
sql/backends/monet5/generator/Tests/generator00.stable.err
sql/backends/monet5/generator/Tests/generator00.stable.out
sql/backends/monet5/generator/Tests/generator01.sql
sql/backends/monet5/generator/Tests/generator01.stable.err
sql/backends/monet5/generator/Tests/generator01.stable.out
sql/backends/monet5/generator/Tests/generator02.sql
sql/backends/monet5/generator/Tests/generator02.stable.err
sql/backends/monet5/generator/Tests/generator02.stable.out
sql/backends/monet5/generator/Tests/generator03.sql
sql/backends/monet5/generator/Tests/generator03.stable.err
sql/backends/monet5/generator/Tests/generator03.stable.out
sql/backends/monet5/generator/Tests/generator04.sql
sql/backends/monet5/generator/Tests/generator04.stable.err
sql/backends/monet5/generator/Tests/generator04.stable.out
sql/backends/monet5/generator/Tests/joins00.sql
sql/backends/monet5/generator/Tests/joins00.stable.err
sql/backends/monet5/generator/Tests/joins00.stable.out
sql/backends/monet5/generator/Tests/joins01.sql
sql/backends/monet5/generator/Tests/joins01.stable.err
sql/backends/monet5/generator/Tests/joins01.stable.out
sql/backends/monet5/generator/Tests/joins02.sql
sql/backends/monet5/generator/Tests/joins02.stable.err
sql/backends/monet5/generator/Tests/joins02.stable.out
sql/backends/monet5/generator/Tests/thetaselect00.sql
sql/backends/monet5/generator/Tests/thetaselect00.stable.err
sql/backends/monet5/generator/Tests/thetaselect00.stable.out
sql/backends/monet5/generator/generator.c
sql/backends/monet5/generator/generator.h
sql/backends/monet5/generator/generator.mal
testing/ChangeLog.Oct2014
tools/merovingian/ChangeLog.Oct2014
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
clients/R/MonetDB.R/DESCRIPTION
clients/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_bam.stable.out
clients/Tests/MAL-signatures_gsl.stable.out
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_bam.stable.out
clients/Tests/SQL-dump_bam.stable.out.oid32
clients/Tests/SQL-dump_gsl.stable.out
clients/Tests/SQL-dump_gsl.stable.out.oid32
clients/Tests/SQL-dump_nogeom.stable.out
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
clients/mapilib/ChangeLog
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
common/stream/ChangeLog
configure.ag
debian/monetdb5-server.install
gdk/ChangeLog
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/libbat.rc
geom/sql/Tests/relation.sql
geom/sql/Tests/relation.stable.err
geom/sql/Tests/relation.stable.out
geom/sql/Tests/spatial.sql
geom/sql/Tests/spatial.stable.out
monetdb5/extras/Makefile.ag
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_linker.h
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/batcalc.mal
monetdb5/modules/mal/batcalc.mal.sh
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/calc.mal
monetdb5/modules/mal/calc.mal.sh
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.mal
monetdb5/tests/gdkTests/Tests/All
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/backends/monet5/Makefile.ag
sql/backends/monet5/Tests/All
sql/backends/monet5/mal_backend.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_user.c
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out
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/12-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
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/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/common/sql_keyword.c
sql/common/sql_list.c
sql/common/sql_mem.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_mem.h
sql/server/Makefile.ag
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/sql_env.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_qc.c
sql/server/sql_scan.c
sql/storage/restrict/restrict_table.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/storage/store_dependency.c
sql/storage/store_sequence.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.sql
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions_bam.stable.out
sql/test/Tests/systemfunctions_gsl.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_bam.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_bam.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_bam.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_bam.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_bam.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/pg_regress/Tests/create_misc.sql
sql/test/pg_regress/Tests/create_view.sql
sql/test/pg_regress/Tests/create_view.stable.err
sql/test/pg_regress/Tests/create_view.stable.out
sql/test/pg_regress/postgresql2sql99.sh
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
testing/Mtest.py.in
tools/merovingian/ChangeLog
vertoo.data
Branch: geo
Log Message:
Merge with default branch.
diffs (truncated from 83156 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -572,3 +572,4 @@ 0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f
6830d0b9c31fe23954c75014a581f145c7a551ff Jan2014_21
0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
6c7d5f562fcb044b745c871344c25b1c6bab7cf4 Jan2014_SP3_release
+3899334ca1f3c13924e8bd22d2afab8ab468e5ba Oct2014_root
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.18.0
+%define version 11.20.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.18.0"
+ "ProductVersion" = "8:11.20.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -428,7 +428,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.18.0"
+ "ProductVersion" = "8:11.20.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -2242,7 +2242,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.18.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.20.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3182,7 +3182,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.18.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.20.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4246,7 +4246,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.18.0"
+ "Name" = "8:MonetDB-SQL-11.20.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4296,7 +4296,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.18.0"
+ "ProductVersion" = "8:11.20.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.18.0"
+ "ProductVersion" = "8:11.20.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -428,7 +428,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.18.0"
+ "ProductVersion" = "8:11.20.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -2242,7 +2242,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.18.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.20.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3182,7 +3182,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.18.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.20.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4246,7 +4246,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.18.0"
+ "Name" = "8:MonetDB-SQL-11.20.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4296,7 +4296,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.18.0"
+ "ProductVersion" = "8:11.20.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -793,13 +793,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.18.0"
+#define PACKAGE_STRING "MonetDB 11.20.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.18.0"
+#define PACKAGE_VERSION "11.20.0"
/* Define to the home page for this package. */
#define PACKAGE_URL ""
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
# Copyright August 2008-2014 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.18.0
+VERSION=11.20.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
@@ -356,6 +356,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_LIBBZ2_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_LIBR
+ $(ECHO) HAVE_LIBR_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_LIBR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_LIBZ
$(ECHO) HAVE_LIBZ_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,8 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Thu Apr 10 2014 Sjoerd Mullender <[email protected]>
-- Jacqueline, the MonetDB/JAQL frontend, has been removed. The frontend
- never grew beyond being experimental, and there is no interest anymore
- to maintain the code.
-
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Oct2014
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Oct2014
diff --git a/clients/ChangeLog b/clients/ChangeLog.Oct2014
copy from clients/ChangeLog
copy to clients/ChangeLog.Oct2014
diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION
--- a/clients/R/MonetDB.R/DESCRIPTION
+++ b/clients/R/MonetDB.R/DESCRIPTION
@@ -1,5 +1,6 @@
Package: MonetDB.R
Version: 0.9.5
+Date: 2014-07-24
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"[email protected]"),
person("Thomas Lumley", role = "ctb"),
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,9 +1,10 @@
exports
-HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS?MAL-signatures
-HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL&!HAVE_SAMTOOLS?MAL-signatures_gsl
-HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL&HAVE_SAMTOOLS?MAL-signatures_bam
-HAVE_GEOM&HAVE_CFITSIO&HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS?MAL-signatures_sphinxclient
-HAVE_GEOM&!HAVE_CFITSIO&!HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS?MAL-signatures_nocfitsio
+HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS&!HAVE_LIBR?MAL-signatures
+HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL&!HAVE_SAMTOOLS&!HAVE_LIBR?MAL-signatures_gsl
+HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL&HAVE_SAMTOOLS&!HAVE_LIBR?MAL-signatures_bam
+HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT&HAVE_GSL&HAVE_SAMTOOLS&HAVE_LIBR?MAL-signatures_R
+HAVE_GEOM&HAVE_CFITSIO&HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS&!HAVE_LIBR?MAL-signatures_sphinxclient
+HAVE_GEOM&!HAVE_CFITSIO&!HAVE_SPHINXCLIENT&!HAVE_GSL&!HAVE_SAMTOOLS&!HAVE_LIBR?MAL-signatures_nocfitsio
HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump
HAVE_GEOM&HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_gsl
HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?SQL-dump_bam
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
@@ -21741,293 +21741,69 @@ pattern batcalc.bit(b:bat[:oid,:void]):b
address CMDconvertsignal_bit;
comment cast from void to bit, signal error on overflow
-pattern
batcalc.between(b:bat[:oid,:oid],lo:oid,hi:oid,s:bat[:oid,:oid]):bat[:oid,:bit]
+pattern
batcalc.between_symmetric(b:bat[:oid,:any_1],v1:any_1,v2:any_1,s:bat[:oid,:oid]):bat[:oid,:bit]
+address CMDbatBETWEENsymmetric;
+comment B between V1 and V2 (or vice versa) inclusive with candidates list
+
+pattern
batcalc.between_symmetric(b:bat[:oid,:any_1],v1:any_1,v2:any_1):bat[:oid,:bit]
+address CMDbatBETWEENsymmetric;
+comment B between V1 and V2 (or vice versa) inclusive
+
+pattern
batcalc.between_symmetric(b:bat[:oid,:any_1],v1:any_1,v2:bat[:oid,:any_1],s:bat[:oid,:oid]):bat[:oid,:bit]
+address CMDbatBETWEENsymmetric;
+comment B between V1 and V2 (or vice versa) inclusive with candidates list
+
+pattern
batcalc.between_symmetric(b:bat[:oid,:any_1],v1:any_1,v2:bat[:oid,:any_1]):bat[:oid,:bit]
+address CMDbatBETWEENsymmetric;
+comment B between V1 and V2 (or vice versa) inclusive
+
+pattern
batcalc.between_symmetric(b:bat[:oid,:any_1],v1:bat[:oid,:any_1],v2:any_1,s:bat[:oid,:oid]):bat[:oid,:bit]
+address CMDbatBETWEENsymmetric;
+comment B between V1 and V2 (or vice versa) inclusive with candidates list
+
+pattern
batcalc.between_symmetric(b:bat[:oid,:any_1],v1:bat[:oid,:any_1],v2:any_1):bat[:oid,:bit]
+address CMDbatBETWEENsymmetric;
+comment B between V1 and V2 (or vice versa) inclusive
+
+pattern
batcalc.between_symmetric(b:bat[:oid,:any_1],v1:bat[:oid,:any_1],v2:bat[:oid,:any_1],s:bat[:oid,:oid]):bat[:oid,:bit]
+address CMDbatBETWEENsymmetric;
+comment B between V1 and V2 (or vice versa) inclusive with candidates list
+
+pattern
batcalc.between_symmetric(b:bat[:oid,:any_1],v1:bat[:oid,:any_1],v2:bat[:oid,:any_1]):bat[:oid,:bit]
+address CMDbatBETWEENsymmetric;
+comment B between V1 and V2 (or vice versa) inclusive
+
+pattern
batcalc.between(b:bat[:oid,:any_1],lo:any_1,hi:any_1,s:bat[:oid,:oid]):bat[:oid,:bit]
address CMDbatBETWEEN;
-comment B between LO and HI inclusive with candidates list, nil border is
(minus) infinity
-
-pattern batcalc.between(b:bat[:oid,:oid],lo:oid,hi:oid):bat[:oid,:bit]
+comment B between LO and HI inclusive with candidates list
+
+pattern batcalc.between(b:bat[:oid,:any_1],lo:any_1,hi:any_1):bat[:oid,:bit]
address CMDbatBETWEEN;
-comment B between LO and HI inclusive, nil border is (minus) infinity
-
-pattern
batcalc.between(b:bat[:oid,:oid],lo:oid,hi:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit]
+comment B between LO and HI inclusive
+
+pattern
batcalc.between(b:bat[:oid,:any_1],lo:any_1,hi:bat[:oid,:any_1],s:bat[:oid,:oid]):bat[:oid,:bit]
address CMDbatBETWEEN;
-comment B between LO and HI inclusive with candidates list, nil border is
(minus) infinity
-
-pattern
batcalc.between(b:bat[:oid,:oid],lo:oid,hi:bat[:oid,:oid]):bat[:oid,:bit]
+comment B between LO and HI inclusive with candidates list
+
+pattern
batcalc.between(b:bat[:oid,:any_1],lo:any_1,hi:bat[:oid,:any_1]):bat[:oid,:bit]
address CMDbatBETWEEN;
-comment B between LO and HI inclusive, nil border is (minus) infinity
-
-pattern
batcalc.between(b:bat[:oid,:oid],lo:bat[:oid,:oid],hi:oid,s:bat[:oid,:oid]):bat[:oid,:bit]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
