Changeset: 0fde0291fa8a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0fde0291fa8a
Added Files:
sql/test/BugTracker-2013/Tests/boolean_column_predicate.Bug-3412.sql
sql/test/BugTracker-2013/Tests/boolean_column_predicate.Bug-3412.stable.err
sql/test/BugTracker-2013/Tests/boolean_column_predicate.Bug-3412.stable.out
sql/test/BugTracker-2013/Tests/not_null.Bug-3403.sql
sql/test/BugTracker-2013/Tests/not_null.Bug-3403.stable.err
sql/test/BugTracker-2013/Tests/not_null.Bug-3403.stable.out
sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.sql
sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.err
sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.sql
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.stable.err
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.stable.out
sql/test/BugTracker-2013/Tests/timestamp.Bug-3401.sql
sql/test/BugTracker-2013/Tests/timestamp.Bug-3401.stable.err
sql/test/BugTracker-2013/Tests/timestamp.Bug-3401.stable.out
Removed Files:
clients/Tests/MAL-signatures_nogeom.malC.src
clients/Tests/MAL-signatures_nogeom.stable.err
clients/Tests/MAL-signatures_nogeom.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/All
clients/mapiclient/tomograph.c
clients/mapilib/mapi.rc
clients/odbc/driver/SQLGetTypeInfo.c
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
gdk/gdk_atoms.h
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc_compare.h
gdk/libbat.rc
monetdb5/mal/Tests/dynamicload.stable.out
monetdb5/mal/Tests/tst120.stable.out
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/url.c
monetdb5/modules/mal/Tests/mapi01.stable.out
monetdb5/modules/mal/Tests/mapi04.stable.out
monetdb5/modules/mal/Tests/mapi05.stable.out
monetdb5/modules/mal/Tests/mapi06.stable.out
monetdb5/modules/mal/Tests/mapi07.stable.out
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_scenario.c
sql/dump-restore.html
sql/dump-restore.txt
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/rel_select.h
sql/server/sql_mvc.c
sql/test/BugTracker-2010/Tests/COPY_INTO_with_backslashes.Bug-2748.stable.out
sql/test/BugTracker-2010/Tests/call_function_without_warning.Bug-2752.stable.out
sql/test/BugTracker-2010/Tests/crash_default_unlocked.Bug-2744.stable.out
sql/test/BugTracker-2010/Tests/foreign_key_type_mismatch.Bug-2745.stable.out
sql/test/BugTracker-2010/Tests/multiple-common-table-expressions.Bug-2664.stable.out
sql/test/BugTracker-2010/Tests/second_function_existing_signature.Bug-2611.stable.out
sql/test/BugTracker-2010/Tests/select_from_seq.Bug-2730.stable.out
sql/test/BugTracker-2010/Tests/store_function_argument_correctly.Bug-2750.stable.out
sql/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out
sql/test/BugTracker-2010/Tests/update_statement_in_function_ignored.Bug-2614.stable.out
sql/test/BugTracker-2010/Tests/values.Bug-2726.stable.out
sql/test/BugTracker-2010/Tests/wrong_error_message_dropping_view.Bug-2713.stable.out
sql/test/BugTracker-2011/Tests/multicolumn_constraints.Bug-2849.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql
sql/test/datacell/Tests/crashonundefined.stable.out
sql/test/datacell/Tests/select.stable.out
sql/test/datacell/Tests/topbasket.stable.out
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.out
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.stable.out
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/Tests/insert_quser.stable.out
sql/test/ssqq/Tests/ssqq.stable.out
testing/Mtest.py.in
vertoo.data
Branch: SciQL-2
Log Message:
merged with Feb2013
diffs (truncated from 45987 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -537,3 +537,5 @@ 89679ea95aac8f548c787cd74c35212137f5b56f
11955d7a07f23672650e41dd0c9fbc9e0fc4c1af Feb2013_SP4_release
4e2a5af00230f6a0e4f51778744c9fcd353a6ba5 Feb2013_17
35b5a0d1fc95cbf151767e6d8e3c01b1e0316c1e Feb2013_SP5_release
+2a7d1ac727ae65bb14a6d59bf8beed8ffdde2cd3 Feb2013_19
+09c8c6c3f81fe53b0a38727e676f379715d012cf Feb2013_SP6_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.15.19
+%define version 11.15.20
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -548,8 +548,15 @@ systemd-tmpfiles --create %{_sysconfdir}
%{_libdir}/monetdb5/sql*.mal
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
+%if (0%{?fedora} >= 20)
+%dir %{_datadir}/doc/MonetDB-SQL
+%docdir %{_datadir}/doc/MonetDB-SQL
+%{_datadir}/doc/MonetDB-SQL/*
+%else
+%dir %{_datadir}/doc/MonetDB-SQL-%{version}
%docdir %{_datadir}/doc/MonetDB-SQL-%{version}
%{_datadir}/doc/MonetDB-SQL-%{version}/*
+%endif
%package -n python-monetdb
Summary: Native MonetDB client Python API
@@ -722,6 +729,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -f $RPM_BUILD_ROOT%{_libdir}/libmonetdb5.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libmonetdb5.so
+%if 0%{?fedora} >= 20
+mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL-%{version}
$RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL
+%endif
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
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.15.19"
+ "ProductVersion" = "8:11.15.20"
"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
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.15.19"
+ "ProductVersion" = "8:11.15.20"
"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
@@ -2367,7 +2367,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.15.19\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.15.20\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3027,7 +3027,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.15.19\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.15.20\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4251,7 +4251,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.15.19"
+ "Name" = "8:MonetDB-SQL-11.15.20"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4301,7 +4301,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.15.19"
+ "ProductVersion" = "8:11.15.20"
"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.15.19"
+ "ProductVersion" = "8:11.15.20"
"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
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.15.19"
+ "ProductVersion" = "8:11.15.20"
"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
@@ -2187,7 +2187,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.15.19\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.15.20\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3087,7 +3087,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.15.19\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.15.20\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4251,7 +4251,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.15.19"
+ "Name" = "8:MonetDB-SQL-11.15.20"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4301,7 +4301,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.15.19"
+ "ProductVersion" = "8:11.15.20"
"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
@@ -727,7 +727,7 @@
#define MONETDB5_PASSWDHASH "SHA512"
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "Feb2013-SP6"
+#define MONETDB_RELEASE "unreleased"
/* Define if the oid type should use 32 bits on a 64-bit architecture */
/* #undef MONET_OID32 */
@@ -748,13 +748,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.15.19"
+#define PACKAGE_STRING "MonetDB 11.15.20"
/* 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.15.19"
+#define PACKAGE_VERSION "11.15.20"
/* 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-2013 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.15.19
+VERSION=11.15.20
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,7 +1,6 @@
exports
HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT?MAL-signatures
HAVE_GEOM&HAVE_CFITSIO&HAVE_SPHINXCLIENT?MAL-signatures_sphinxclient
-!HAVE_GEOM&HAVE_CFITSIO&!HAVE_SPHINXCLIENT?MAL-signatures_nogeom
!HAVE_CFITSIO&HAVE_GEOM&!HAVE_SPHINXCLIENT?MAL-signatures_nocfitsio
HAVE_GEOM?SQL-dump
!HAVE_GEOM?SQL-dump_nogeom
diff --git a/clients/Tests/MAL-signatures_nogeom.malC.src
b/clients/Tests/MAL-signatures_nogeom.malC.src
deleted file mode 100644
--- a/clients/Tests/MAL-signatures_nogeom.malC.src
+++ /dev/null
@@ -1,1 +0,0 @@
-$RELSRCDIR/MAL-signatures.malC
diff --git a/clients/Tests/MAL-signatures_nogeom.stable.err
b/clients/Tests/MAL-signatures_nogeom.stable.err
deleted file mode 100644
--- a/clients/Tests/MAL-signatures_nogeom.stable.err
+++ /dev/null
@@ -1,29 +0,0 @@
-stderr of test 'MAL-signatures_nogeom` in directory 'clients` itself:
-
-
-# 20:07:36 >
-# 20:07:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31131" "--set"
"mapi_usock=/var/tmp/mtest-1103/.s.monetdb.31131" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_clients"
"MAL-signatures_nogeom.mal"
-# 20:07:36 >
-
-# builtin opt gdk_dbpath =
/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 31131
-# cmdline opt mapi_usock = /var/tmp/mtest-1103/.s.monetdb.31131
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_clients
-
-# 20:07:38 >
-# 20:07:38 > "Done."
-# 20:07:38 >
-
diff --git a/clients/Tests/MAL-signatures_nogeom.stable.out
b/clients/Tests/MAL-signatures_nogeom.stable.out
deleted file mode 100644
--- a/clients/Tests/MAL-signatures_nogeom.stable.out
+++ /dev/null
@@ -1,42999 +0,0 @@
-stdout of test 'MAL-signatures_nogeom` in directory 'clients` itself:
-
-
-# 20:07:36 >
-# 20:07:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31131" "--set"
"mapi_usock=/var/tmp/mtest-1103/.s.monetdb.31131" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_clients"
"MAL-signatures_nogeom.mal"
-# 20:07:36 >
-
-# MonetDB 5 server v11.15.12
-# This is an unreleased version
-# Serving database 'mTests_clients', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.591 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:31131/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-1103/.s.monetdb.31131
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-
-# 00:44:35 >
-# 00:44:35 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13629" "--port=31724"
-# 00:44:35 >
-
-#?*)
-command
aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg3_dbl;
-comment Grouped tail average on dbl
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
