Changeset: 0102e1e4c743 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0102e1e4c743 Added Files: ChangeLog.Jul2017 NT/mkgeomwxs.py NT/mkodbcwxs.py NT/mksqlwxs.py buildtools/ChangeLog.Jul2017 clients/ChangeLog.Jul2017 clients/Tests/mclient-uri.SQL.bat clients/Tests/mclient-uri.SQL.sh clients/Tests/mclient-uri.stable.err clients/Tests/mclient-uri.stable.out clients/Tests/mclient-uri.stable.out.Windows clients/mapilib/ChangeLog.Jul2017 common/stream/ChangeLog.Jul2017 gdk/ChangeLog.Jul2017 geom/ChangeLog.Jul2017 monetdb5/ChangeLog.Jul2017 monetdb5/modules/mal/wlc.c monetdb5/modules/mal/wlc.h monetdb5/modules/mal/wlc.mal monetdb5/optimizer/opt_wlc.c monetdb5/optimizer/opt_wlc.h sql/ChangeLog.Jul2017 sql/backends/monet5/Tests/dbextra_lock_test.py sql/backends/monet5/Tests/dbextra_lock_test.stable.err sql/backends/monet5/Tests/dbextra_lock_test.stable.out sql/backends/monet5/wlr.c sql/backends/monet5/wlr.h sql/backends/monet5/wlr.mal sql/scripts/60_wlcr.sql sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.sql sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.err sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.out sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.err sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.out sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.sql sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.err sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.out sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.sql sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.err sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.out sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.sql sql/test/BugTracker-2017/Tests/lateral.Bug-6310.sql sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.sql sql/test/BugTracker-2017/Tests/limit_clause.Bug-6312.sql sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.sql sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.out sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.sql sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.err sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.sql sql/test/Tests/copy-into-fwf.sql.in sql/test/Tests/copy-into-fwf.stable.err sql/test/Tests/copy-into-fwf.stable.out sql/test/Tests/mtcars sql/test/wlcr/Tests/All sql/test/wlcr/Tests/wlc01.py sql/test/wlcr/Tests/wlc01.stable.err sql/test/wlcr/Tests/wlc01.stable.out sql/test/wlcr/Tests/wlc100.py sql/test/wlcr/Tests/wlc100.stable.err sql/test/wlcr/Tests/wlc100.stable.out sql/test/wlcr/Tests/wlc20.py sql/test/wlcr/Tests/wlc20.stable.err sql/test/wlcr/Tests/wlc20.stable.out sql/test/wlcr/Tests/wlc21.py sql/test/wlcr/Tests/wlc21.stable.err sql/test/wlcr/Tests/wlc21.stable.out sql/test/wlcr/Tests/wlc30.py sql/test/wlcr/Tests/wlc30.stable.err sql/test/wlcr/Tests/wlc30.stable.out sql/test/wlcr/Tests/wlc40.py sql/test/wlcr/Tests/wlc40.stable.err sql/test/wlcr/Tests/wlc40.stable.out sql/test/wlcr/Tests/wlc50.py sql/test/wlcr/Tests/wlc50.stable.err sql/test/wlcr/Tests/wlc50.stable.out sql/test/wlcr/Tests/wlc70.py sql/test/wlcr/Tests/wlc70.stable.err sql/test/wlcr/Tests/wlc70.stable.out sql/test/wlcr/Tests/wlcr00.py sql/test/wlcr/Tests/wlcr00.stable.err sql/test/wlcr/Tests/wlcr00.stable.out sql/test/wlcr/Tests/wlr01.py sql/test/wlcr/Tests/wlr01.reqtests sql/test/wlcr/Tests/wlr01.stable.err sql/test/wlcr/Tests/wlr01.stable.out sql/test/wlcr/Tests/wlr100.py sql/test/wlcr/Tests/wlr100.stable.err sql/test/wlcr/Tests/wlr100.stable.out sql/test/wlcr/Tests/wlr20.py sql/test/wlcr/Tests/wlr20.reqtests sql/test/wlcr/Tests/wlr20.stable.err sql/test/wlcr/Tests/wlr20.stable.out sql/test/wlcr/Tests/wlr30.py sql/test/wlcr/Tests/wlr30.reqtests sql/test/wlcr/Tests/wlr30.stable.err sql/test/wlcr/Tests/wlr30.stable.out sql/test/wlcr/Tests/wlr40.py sql/test/wlcr/Tests/wlr40.reqtests sql/test/wlcr/Tests/wlr40.stable.err sql/test/wlcr/Tests/wlr40.stable.out sql/test/wlcr/Tests/wlr50.py sql/test/wlcr/Tests/wlr50.stable.err sql/test/wlcr/Tests/wlr50.stable.out sql/test/wlcr/Tests/wlr70.py sql/test/wlcr/Tests/wlr70.stable.err sql/test/wlcr/Tests/wlr70.stable.out testing/ChangeLog.Jul2017 tools/merovingian/ChangeLog.Jul2017 Removed Files: NT/installer32/MonetDB-ODBC-Driver.sln NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.sln NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.sln NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer32/cv64-32.sh NT/installer64/MonetDB-ODBC-Driver.sln NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.sln NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.sln NT/installer64/MonetDB5-SQL-Installer.vdproj NT/installer64/cv32-64.sh NT/installer64/fixmsi.py monetdb5/scheduler/srvpool.c monetdb5/scheduler/srvpool.h monetdb5/scheduler/srvpool.mal Modified Files: .hgtags ChangeLog MonetDB.spec NT/Makefile NT/monetdb_config.h.in NT/rules.msc README.rst bootstrap buildtools/autogen/setup.py buildtools/conf/banner.bmp buildtools/conf/website.html buildtools/doc/windowsbuild.rst clients/ChangeLog clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dotmonetdb.c clients/mapiclient/dump.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/samples/arraytest.c clients/odbc/samples/odbcsample1.c clients/odbc/samples/testgetinfo.c clients/odbc/winsetup/setup.rc common/stream/stream.c common/stream/stream.h common/utils/msabaoth.c common/utils/mutils.h configure.ag debian/changelog debian/control gdk/ChangeLog gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_utils.c gdk/libbat.rc geom/monetdb5/Makefile.ag geom/monetdb5/geom.c geom/monetdb5/geom_upgrade.c libversions monetdb5/ChangeLog monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Dec2016 monetdb5/extras/mal_optimizer_template/Makefile.ag monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/rapi/rapi.c monetdb5/mal/Makefile.ag monetdb5/mal/mal.c monetdb5/mal/mal_atom.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_builder.c monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_function.c monetdb5/mal/mal_import.c monetdb5/mal/mal_import.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_parser.h monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_session.c monetdb5/mal/mal_type.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/color.c monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/Makefile.ag monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/mal_init.mal monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/manual.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/querylog.h monetdb5/modules/mal/remote.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h monetdb5/modules/mal/txtsim.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal monetdb5/scheduler/Makefile.ag monetdb5/scheduler/run_adder.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/40_sql.mal sql/backends/monet5/LSST/Makefile.ag sql/backends/monet5/Makefile.ag sql/backends/monet5/UDF/cudf/README sql/backends/monet5/UDF/pyapi/convert_loops.h sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/UDF/pyapi/unicode.c sql/backends/monet5/generator/Makefile.ag sql/backends/monet5/generator/generator.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_bat2time.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_rank.mal sql/backends/monet5/sql_result.c sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_transaction.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/vaults/Makefile.ag sql/backends/monet5/vaults/bam/bam_export.c sql/backends/monet5/vaults/bam/bam_globals.h sql/backends/monet5/vaults/bam/bam_lib.c sql/backends/monet5/vaults/bam/bam_wrapper.c sql/backends/monet5/vaults/fits/Makefile.ag sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/netcdf/Makefile.ag sql/backends/monet5/vaults/shp/shp.c sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out sql/common/sql_mem.c sql/common/sql_types.c sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out sql/scripts/25_debug.sql sql/scripts/51_sys_schema_extension.sql sql/scripts/Makefile.ag sql/server/Makefile.ag sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_planner.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_mvc.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/bat/bat_utils.c sql/storage/bat/res_table.c sql/storage/store.c sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out sql/test/BugTracker-2016/Tests/storagemodel.sql sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/Dump/Tests/dump.stable.out sql/test/Tests/All sql/test/Tests/setoptimizer.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/mergetables/Tests/mergequery.stable.out sql/test/orderidx/Tests/simpletable.stable.out.32bit sql/test/orderidx/Tests/smalltable.stable.out.32bit sql/test/pg_regress/Tests/float8.stable.out sql/test/remote/Tests/partition_elim.stable.out sql/test/remote/Tests/ssbm.stable.err sql/test/remote/Tests/ssbm.stable.out.int128 sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows 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/dump.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out.Windows sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-dump.stable.out sql/test/testdb/Tests/testdb-dump.stable.out.Windows sql/test/testdb/Tests/testdb-load.sql testing/process.py tools/merovingian/client/monetdb.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/utils/database.c tools/merovingian/utils/database.h tools/merovingian/utils/glob.c tools/merovingian/utils/properties.c tools/merovingian/utils/utils.c tools/merovingian/utils/utils.h tools/mserver/monet_version.c.in tools/mserver/mserver5.c vertoo.config vertoo.data Branch: viewless Log Message:
merge default diffs (truncated from 123270 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -667,3 +667,7 @@ 07824a1c7beb75308b813378af33c243f1c2f511 c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_19 07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release +54a8c9d99dc3621a02579db0c59309781caceb54 Jul2017_root +05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_21 +c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release +05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_SP4_release diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu April 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> -- Added a new server-side protocol implementation. The new protocol is backwards compatible with the old protocol. Clients can choose whether they want to use the old or the new protocol during the initial handshake with the server. The new protocol is a binary column-based protocol that is significantly faster than the old protocol when transferring large result sets. In addition, the new protocol supports compression using Snappy or LZ4. - -* Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> -- Added 5 new sys schema tables: function_languages, function_types, - key_types, index_types and privilege_codes. They are pre-loaded with - static content and contain descriptive names for the various integer - type and code values. See also sql/scripts/51_sys_schema_extension.sql diff --git a/ChangeLog b/ChangeLog.Jul2017 copy from ChangeLog copy to ChangeLog.Jul2017 --- a/ChangeLog +++ b/ChangeLog.Jul2017 @@ -1,8 +1,24 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu April 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> -- Added a new server-side protocol implementation. The new protocol is backwards compatible with the old protocol. Clients can choose whether they want to use the old or the new protocol during the initial handshake with the server. The new protocol is a binary column-based protocol that is significantly faster than the old protocol when transferring large result sets. In addition, the new protocol supports compression using Snappy or LZ4. +* Thu Apr 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> +- Added a new server-side protocol implementation. The new protocol + is backwards compatible with the old protocol. Clients can choose + whether they want to use the old or the new protocol during the initial + handshake with the server. The new protocol is a binary column-based + protocol that is significantly faster than the old protocol when + transferring large result sets. In addition, the new protocol supports + compression using Snappy or LZ4. + +* Mon Feb 20 2017 Sjoerd Mullender <sjo...@acm.org> +- Moved the sphinx extension module to its own repository. + See https://dev.monetdb.org/hg/MonetDB-sphinx/. + +* Thu Feb 16 2017 Sjoerd Mullender <sjo...@acm.org> +- Removed GSL module: it's now a separate (extension) package. + See https://dev.monetdb.org/hg/MonetDB-gsl/. +- The PCRE library is now optional for systems that support POSIX regular + expressions. * Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> - Added 5 new sys schema tables: function_languages, function_types, diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.26.0 +%define version 11.28.0 %{!?buildno: %global buildno %(date +%Y%m%d)} # groups of related archs @@ -131,8 +131,8 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 -URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2 +URL: https://www.monetdb.org/ +Source: https://www.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -953,6 +953,16 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Tue Apr 25 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.21-20170425 +- Rebuilt. +- BZ#6260: Sqlitelogictest crash +- BZ#6288: Function cannot find column in merge table +- BZ#6295: msqldump writes unescaped timestamp values when using inserts + +* Wed Apr 19 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.21-20170425 +- monetdb5: Fixed a bug causing a crash during cleanup when mserver5 is stopped + with monetdb stop database. + * Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418 - Rebuilt. - BZ#6259: crash on select query from sqlitelogictests diff --git a/NT/Makefile b/NT/Makefile --- a/NT/Makefile +++ b/NT/Makefile @@ -9,12 +9,15 @@ TOPDIR = . srcdir = $(TOPDIR)\.. +# location of NT directory +NT = $(srcdir)\NT + prefix = $(MAKEDIR) # ensure "all" is first target all: _all -!INCLUDE "$(TOPDIR)\..\NT\rules.msc" +!INCLUDE "$(NT)\rules.msc" _all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h unistd.h .monetdb $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" all @@ -22,14 +25,15 @@ all: _all install: targetdirs all $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" install $(INSTALL) .monetdb "$(sysconfdir)" - $(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)" - $(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)" + $(PYTHON) $(NT)\mksqlwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" "$(prefix)" > "$(prefix)\MonetDB5-SQL-Installer.wxs" + $(PYTHON) $(NT)\mkgeomwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" "$(prefix)" > "$(prefix)\MonetDB5-Geom-Installer.wxs" + $(PYTHON) $(NT)\mkodbcwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" "$(prefix)" > "$(prefix)\MonetDB-ODBC-Installer.wxs" $(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag" cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&$(PYTHON) buildtools\autogen\autogen.py -monetdb_config.h: "$(TOPDIR)\winconfig_conds.py" "$(srcdir)\NT\monetdb_config.h.in" - $(CONFIGURE) "$(srcdir)\NT\monetdb_config.h.in" > monetdb_config.h +monetdb_config.h: "$(TOPDIR)\winconfig_conds.py" "$(NT)\monetdb_config.h.in" + $(CONFIGURE) "$(NT)\monetdb_config.h.in" > monetdb_config.h unistd.h: $(ECHO) #ifndef UNISTD_H > unistd.h diff --git a/NT/installer32/MonetDB-ODBC-Driver.sln b/NT/installer32/MonetDB-ODBC-Driver.sln deleted file mode 100644 --- a/NT/installer32/MonetDB-ODBC-Driver.sln +++ /dev/null @@ -1,19 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MonetDB-ODBC-Installer", "MonetDB-ODBC-Installer.vdproj", "{33AE0CC1-169E-4168-978A-0CDDD1E6A51A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Default = Debug|Default - Release|Default = Release|Default - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Debug|Default.ActiveCfg = Debug - {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Debug|Default.Build.0 = Debug - {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Release|Default.ActiveCfg = Release - {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Release|Default.Build.0 = Release - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj b/NT/installer32/MonetDB-ODBC-Installer.vdproj deleted file mode 100644 --- a/NT/installer32/MonetDB-ODBC-Installer.vdproj +++ /dev/null @@ -1,1225 +0,0 @@ -"DeployProject" -{ -"VSVersion" = "3:800" -"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" -"IsWebType" = "8:FALSE" -"ProjectName" = "8:MonetDB-ODBC-Installer" -"LanguageId" = "3:1033" -"CodePage" = "3:1252" -"UILanguageId" = "3:1033" -"SccProjectName" = "8:" -"SccLocalPath" = "8:" -"SccAuxPath" = "8:" -"SccProvider" = "8:" - "Hierarchy" - { - "Entry" - { - "MsmKey" = "8:_14F4BC1A7F54458D91CFA4A0BD174604" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_17D7FB69076E415C8973295D502161C5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2E74F1B1BDE548A7922BAD968E690A3A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2FB9A57E3DD7443F97A7C8B0DBF82DB5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3517E482BC7F4EFC88537C979178E768" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4F0D2367141846EFA634DA35B05CDA4D" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5CCCB992693C48C0BFEF4B0EFBBD884A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_779449EF5BAD4B068A50802402E52278" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8ADC98E4D05143999FFC87CAB78E68C9" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B1B1C0011D7945F892A77F529772EA72" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BC1CD3A227FA4EB7B035DFA62EF4D82C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CB89303C19364CECA36BDC911637BE9C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D98E545D77674640AD32C43168E2F93D" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E763DA578AC34798B710589F4C224BDE" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E78854C05F3D4756B29D929C6E751845" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - } - "Configurations" - { - "Debug" - { - "DisplayName" = "8:Debug" - "IsDebugOnly" = "11:TRUE" - "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\MonetDB-ODBC-Installer.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:2" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - } - } - } _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
