Changeset: 5a7ec34b6d2b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a7ec34b6d2b
Added Files:
buildtools/ChangeLog.Jun2016
clients/ChangeLog.Jun2016
clients/R/MonetDB.R/man/MonetDBLite.Rd
clients/R/MonetDB.R/man/sqlitecompat.Rd
clients/mapilib/ChangeLog.Jun2016
clients/python2/ChangeLog.Jun2016
clients/python3/ChangeLog.Jun2016
common/stream/ChangeLog.Jun2016
gdk/ChangeLog.Jun2016
geom/ChangeLog.Jun2016
java/ChangeLog.Jun2016
monetdb5/ChangeLog.Jun2016
monetdb5/extras/rapi/converters.c.h
sql/ChangeLog.Jun2016
sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.sql
sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.err
sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out
sql/test/BugTracker-2016/Tests/rank_rewrite.Bug-3890.sql
sql/test/BugTracker-2016/Tests/rank_rewrite.Bug-3890.stable.err
sql/test/BugTracker-2016/Tests/rank_rewrite.Bug-3890.stable.out
sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.sql
testing/ChangeLog.Jun2016
tools/embedded/Makefile.ag
tools/embedded/Tests/All
tools/embedded/Tests/dbi.R
tools/embedded/Tests/dbi.reqtests
tools/embedded/Tests/dbi.stable.err
tools/embedded/Tests/dbi.stable.out
tools/embedded/Tests/deps-test.R
tools/embedded/Tests/deps-test.stable.err
tools/embedded/Tests/deps-test.stable.out
tools/embedded/Tests/deps-test.timeout
tools/embedded/Tests/dplyr.R
tools/embedded/Tests/install-binary.R
tools/embedded/Tests/install-binary.stable.err
tools/embedded/Tests/install-binary.stable.out
tools/embedded/Tests/install-source.R
tools/embedded/Tests/install-source.stable.err
tools/embedded/Tests/install-source.stable.out
tools/embedded/Tests/install-source.timeout
tools/embedded/Tests/install.reqtests
tools/embedded/Tests/lowlevel.R
tools/embedded/Tests/lowlevel.reqtests
tools/embedded/Tests/lowlevel.stable.err
tools/embedded/Tests/lowlevel.stable.out
tools/embedded/build-on-windows.bat
tools/embedded/build-rpkg.sh
tools/embedded/demo.c
tools/embedded/embedded.c
tools/embedded/embedded.h
tools/embedded/embeddedr.c
tools/embedded/embeddedr.h
tools/embedded/inlined_scripts.c
tools/embedded/inlined_scripts.py
tools/embedded/inlined_scripts.sh
tools/embedded/pcre-for-osx.h
tools/embedded/pkg-excludes
tools/embedded/rpackage/DESCRIPTION
tools/embedded/rpackage/NAMESPACE
tools/embedded/rpackage/R/monetdb.R
tools/embedded/rpackage/configure
tools/embedded/rpackage/configure.win
tools/embedded/rpackage/man/embedded.Rd
tools/embedded/undef.h
tools/embedded/windows/libtool.sh
tools/embedded/windows/pmc.sh
tools/embedded/windows/sedscript.tpl
tools/merovingian/ChangeLog.Jun2016
Removed Files:
clients/R/MonetDB.R/src/Makevars.win
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/Makefile.ag
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/control.R
clients/R/MonetDB.R/R/dbi.R
clients/R/MonetDB.R/R/dplyr.R
clients/R/MonetDB.R/R/mapi.R
clients/R/MonetDB.R/man/MonetDB.R.Rd
clients/R/MonetDB.R/man/control.Rd
clients/R/MonetDB.R/man/monetdb.read.csv.Rd
clients/R/MonetDB.R/man/src_monetdb.Rd
clients/R/Tests/All
clients/R/Tests/dbapply.R
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.err
clients/R/Tests/dbi.stable.out
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr.R
clients/R/Tests/install.R
clients/R/build-for-cran.sh
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
common/stream/stream.c
common/stream/stream.h
common/utils/mcrypt.c
common/utils/mcrypt.h
common/utils/mutils.c
common/utils/mutils.h
common/utils/muuid.c
configure.ag
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_bbp.c
gdk/gdk_bbp.h
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
gdk/gdk_utils.h
gdk/libbat.rc
geom/ChangeLog
geom/monetdb5/geom_upgrade.c
java/ChangeLog
monetdb5/ChangeLog
monetdb5/extras/rapi/Makefile.ag
monetdb5/extras/rapi/Tests/rapi02.malC
monetdb5/extras/rapi/Tests/rapi02.stable.out
monetdb5/extras/rapi/rapi.c
monetdb5/mal/Tests/tst830.malC
monetdb5/mal/mal.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_resource.h
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/Tests/All
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/mmath.h
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/backends/monet5/Tests/rapi09.stable.err
sql/backends/monet5/Tests/simpleSQL.stable.err
sql/backends/monet5/Tests/simpleSQL.stable.out
sql/backends/monet5/mal_backend.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_execute.h
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/common/sql_types.h
sql/scripts/99_system.sql
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_planner.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_parser.y
sql/server/sql_qc.c
sql/server/sql_scan.c
sql/storage/bat/bat_logger.c
sql/storage/bat/res_table.c
sql/storage/store.c
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
sql/test/BugTracker-2016/Tests/All
sql/test/Triggers/trigger_insert.sql
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
tools/Makefile.ag
tools/mserver/mserver5.c
vertoo.data
Branch: leftmart
Log Message:
merge with default
diffs (truncated from 23157 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -617,3 +617,4 @@ 25c9f569add9c341d40920f30936890ae6ea68a8
25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_SP2_release
feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_15
feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_SP3_release
+ee2d8c8d65c35ed022ca0785f30fcf4b051a542e Jun2016_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.22.0
+%define version 11.24.0
%{!?buildno: %global 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.22.0"
+ "ProductVersion" = "8:11.24.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
@@ -439,7 +439,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.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
@@ -4270,7 +4270,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.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.22.0"
+ "ProductVersion" = "8:11.24.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
@@ -439,7 +439,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.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
@@ -4270,7 +4270,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.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
@@ -112,10 +112,12 @@
/* Define to 1 if you have the `ctime_r' function. */
#define HAVE_CTIME_R 1
+#ifdef _MSC_VER
/* Define if you have ctime_r(time_t*,char *buf,size_t s) */
#define HAVE_CTIME_R3 1
/* there is something very similar to ctime_r on Windows: */
#define ctime_r(t,b,s) (ctime_s(b,s,t) ? NULL : (b))
+#endif
/* Define if you have the cURL library */
/* #undef HAVE_CURL */
@@ -146,7 +148,7 @@
/* #undef HAVE_FDATASYNC */
/* Define to 1 if you have the <fenv.h> header file. */
-#if _MSC_VER > 1600
+#if !defined(_MSV_VER) || _MSC_VER > 1600
#define HAVE_FENV_H 1
#endif
@@ -157,7 +159,7 @@
#define HAVE_FPCLASS 1 /* uses _fpclass, see mmath.c */
/* Define to 1 if you have the `fpclassify' function. */
-#if _MSC_VER > 1600
+#if defined(_MSC_VER) && _MSC_VER > 1600
#define HAVE_FPCLASSIFY 1
#endif
@@ -172,7 +174,9 @@
/* Define to 1 if you have the `ftruncate' function. */
#define HAVE_FTRUNCATE 1
+#ifdef _MSC_VER
#define ftruncate(fd, sz) (-(_chsize_s((fd), (__int64) (sz)) != 0))
+#endif
/* Define if you use garbage collection */
/* #undef HAVE_GC */
@@ -208,7 +212,9 @@
/* #undef HAVE_GETTIMEOFDAY */
/* Define to 1 if you have the `_get_timezone' function. */
+#ifdef _MSC_VER
#define HAVE__GET_TIMEZONE 1
+#endif
/* Define if you have the gsl library */
/* #undef HAVE_GSL */
@@ -234,7 +240,7 @@
#define HAVE_IO_H 1
/* Define to 1 if you have the `isinf' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSV_VER) || _MSC_VER > 1600
#define HAVE_ISINF 1
#endif
@@ -303,7 +309,7 @@
/* Define to 1 if you have the `llabs' function. */
#define HAVE_LLABS 1
-#if _MSC_VER <= 1500
+#if defined(_MSV_VER) && _MSC_VER <= 1500
#define llabs _abs64
#endif
@@ -319,10 +325,10 @@
/* #undef HAVE_LOCKF */
/* Define to 1 if the system has the type `long long'. */
-#if _MSC_VER > 1600 || (defined(__ICL) && __ICL >= 1010)
+#if (defined(_MSC_VER) && _MSC_VER > 1600) || (defined(__ICL) && __ICL >=
1010) || defined(__MINGW32__)
#define HAVE_LONG_LONG 1
#else
-#if _MSC_VER >= 1300
+#if defined(_MSC_VER) && _MSC_VER >= 1300
/* Visual Studio .NET 2003 does have long long, but the printf %lld
* format is interpreted the same as %ld, i.e. useless
*/
@@ -376,7 +382,7 @@
/* #undef HAVE_NL_LANGINFO */
/* Define to 1 if you have the `nextafterf' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_NEXTAFTERF 1
#endif
@@ -454,7 +460,7 @@
/* #undef HAVE_RLIMIT_H */
/* Define to 1 if you have the `round' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSV_VER) || _MSC_VER > 1600
#define HAVE_ROUND 1
#endif
@@ -525,7 +531,7 @@
#define HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_STDINT_H 1
#endif
@@ -542,7 +548,7 @@
/* #undef HAVE_STRCASESTR */
/* Define to 1 if you have the `strftime' function. */
-#if _MSC_VER >= 1500
+#if !defined(_MSC_VER) || _MSC_VER >= 1500
#define HAVE_STRFTIME 1
#endif
@@ -571,24 +577,24 @@
#define HAVE_STRTOD 1
/* Define to 1 if you have the `strtof' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_STRTOF 1
#endif
#define strtok_r(t,d,c) strtok_s(t,d,c)
/* Define to 1 if you have the `strtoll' function. */
-#if _MSC_VER >= 1300
+#if !defined(_MSC_VER) || _MSC_VER >= 1300
#define HAVE_STRTOLL 1
-#if _MSC_VER <= 1600 && !defined(strtoll)
+#if defined(_MSC_VER) && _MSC_VER <= 1600 && !defined(strtoll)
#define strtoll _strtoi64
#endif
#endif
/* Define to 1 if you have the `strtoull' function. */
-#if _MSC_VER >= 1300
+#if !defined(_MSC_VER) || _MSC_VER >= 1300
#define HAVE_STRTOULL 1
-#if _MSC_VER <= 1600 && !defined(strtoull)
+#if defined(_MSC_VER) && _MSC_VER <= 1600 && !defined(strtoull)
#define strtoull _strtoui64
#endif
#endif
@@ -665,7 +671,7 @@
#define HAVE_TIME_H 1
/* Define to 1 if you have the `trunc' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_TRUNC 1
#endif
@@ -693,8 +699,10 @@
/* Define if you have valgrind installed and want to use it */
/* #undef HAVE_VALGRIND */
+#ifdef _MSC_VER
/* Define to 1 if you have the `_wfopen' function. */
#define HAVE__WFOPEN 1
+#endif
/* Define to 1 if you have the <winsock2.h> header file. */
#define HAVE_WINSOCK2_H 1
@@ -703,7 +711,7 @@
#define HAVE_WINSOCK_H 1
/* Define to 1 if you have the <xmmintrin.h> header file. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_XMMINTRIN_H 1
#endif
@@ -805,13 +813,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.22.0"
+#define PACKAGE_STRING "MonetDB 11.24.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.22.0"
+#define PACKAGE_VERSION "11.24.0"
/* Define to the home page for this package. */
#define PACKAGE_URL ""
@@ -1003,7 +1011,7 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */
/* #undef size_t */
-#if _MSC_VER < 1900
+#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf c99_snprintf
#define vsnprintf c99_vsnprintf
@@ -1047,7 +1055,7 @@ c99_snprintf(char *outBuf, size_t size,
#define ssize_t int
#endif
-#if _MSC_VER <= 1600
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
