Changeset: 1cfe7a09ca42 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1cfe7a09ca42 Added Files: sql/backends/monet5/UDF/capi/Tests/capi15.sql sql/backends/monet5/UDF/capi/Tests/capi15.stable.err sql/backends/monet5/UDF/capi/Tests/capi15.stable.out sql/backends/monet5/UDF/capi/Tests/capi16.sql sql/backends/monet5/UDF/capi/Tests/capi16.stable.err sql/backends/monet5/UDF/capi/Tests/capi16.stable.out sql/backends/monet5/UDF/capi/Tests/capi17.sql sql/backends/monet5/UDF/capi/Tests/capi17.stable.err sql/backends/monet5/UDF/capi/Tests/capi17.stable.out sql/backends/monet5/UDF/capi/Tests/capi18.sql sql/backends/monet5/UDF/capi/Tests/capi18.stable.err sql/backends/monet5/UDF/capi/Tests/capi18.stable.out sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.sql sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.SQL.py sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-not-in.Bug-6605.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-not-in.Bug-6605.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-not-in.Bug-6605.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-distinct-duplicate.Bug-6603.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-distinct-duplicate.Bug-6603.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-distinct-duplicate.Bug-6603.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.out sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.err sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.out sql/test/Dump/Tests/clean-again.reqtests sql/test/Dump/Tests/clean-again.sql.src sql/test/Dump/Tests/clean-again.stable.err sql/test/Dump/Tests/clean-again.stable.out sql/test/Dump/Tests/dump-again.SQL.py sql/test/Dump/Tests/dump-again.reqtests sql/test/Dump/Tests/dump-again.stable.err sql/test/Dump/Tests/dump-again.stable.out sql/test/Dump/Tests/reload-again.SQL.py sql/test/Dump/Tests/reload-again.reqtests sql/test/Dump/Tests/reload-again.stable.err sql/test/Dump/Tests/reload-again.stable.out sql/test/Dump/Tests/test-again.reqtests sql/test/Dump/Tests/test-again.sql.src sql/test/Dump/Tests/test-again.stable.err.src sql/test/Dump/Tests/test-again.stable.out.src sql/test/remote/Tests/creds.SQL.py.in sql/test/remote/Tests/creds.stable.err sql/test/remote/Tests/creds.stable.out sql/test/remote/Tests/different_user.SQL.py.in sql/test/remote/Tests/different_user.stable.err sql/test/remote/Tests/different_user.stable.out sql/test/remote/Tests/invalid_creds.SQL.py.in sql/test/remote/Tests/invalid_creds.stable.err sql/test/remote/Tests/invalid_creds.stable.out Removed Files: NT/mkgeomwxs.py sql/backends/monet5/LSST/80_lsst.mal sql/backends/monet5/LSST/Makefile.ag sql/backends/monet5/LSST/Tests/All sql/backends/monet5/LSST/Tests/lsst.sql.src sql/backends/monet5/LSST/Tests/lsst.stable.err sql/backends/monet5/LSST/Tests/lsst.stable.out sql/backends/monet5/LSST/Tests/lsst_htmxmatch.reqtests sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.err sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out sql/backends/monet5/LSST/lsst.c sql/backends/monet5/LSST/lsst.h sql/backends/monet5/LSST/lsst.mal sql/backends/monet5/LSST/lsst.sql sql/scripts/21_dependency_functions.sql Modified Files: .hgtags ChangeLog MonetDB.spec NT/Makefile NT/mksqlwxs.py buildtools/ChangeLog buildtools/ChangeLog-Archive buildtools/ChangeLog.Mar2018 buildtools/selinux/monetdb.te clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/msqldump.c clients/odbc/driver/Makefile.ag clients/odbc/driver/SQLExecute.c configure.ag debian/changelog debian/fix-deb.sh debian/monetdb5-server.install gdk/ChangeLog gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_unique.c gdk/gdk_utils.c geom/monetdb5/geom.c geom/monetdb5/geomBulk.c geom/monetdb5/geom_upgrade.c geom/sql/conformance/Tests/conformance_load.stable.out geom/sql/functions/Tests/loadTestWKT.stable.out geom/sql/pg_regression/Tests/regress_ogc_cover.stable.out libversions monetdb5/ChangeLog 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/converters.c.h monetdb5/extras/rapi/rapi.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_authorize.h monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/status.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manual.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/remote.h monetdb5/modules/mal/remote.mal monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/txtsim.c monetdb5/modules/mal/wlc.mal monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_wrapper.c sql/ChangeLog sql/ChangeLog-Archive sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/optimizers.stable.out sql/backends/monet5/UDF/capi/Tests/All sql/backends/monet5/UDF/capi/Tests/capi00.stable.out sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/capi/cheader.h sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/convert_loops.h sql/backends/monet5/UDF/pyapi/emit.c sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/UDF/udf/udf.c sql/backends/monet5/generator/Tests/generator00.stable.out 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_cast_impl_down_from_flt.h sql/backends/monet5/sql_cast_impl_int.h sql/backends/monet5/sql_cast_impl_up_to_flt.h sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_scenario.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/vaults/bam/bam_lib.c sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/shp/shp.c sql/backends/monet5/wlr.c sql/backends/monet5/wlr.mal sql/benchmarks/nobench/Tests/nobench.stable.out sql/benchmarks/ssbm/Tests/create.stable.out sql/common/sql_list.c sql/scripts/21_dependency_views.sql sql/scripts/22_clients.sql sql/scripts/Makefile.ag sql/server/rel_distribute.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_optimizer.h sql/server/rel_partition.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_schema.h sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_semantic.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/bat/bat_utils.c sql/storage/bat/bat_utils.h sql/storage/bat/res_table.c sql/test/BugDay_2005-10-06_2.8/Tests/select_null.stable.out sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.stable.out sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out sql/test/BugTracker-2013/Tests/php-size-limit-bug.stable.out sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.out sql/test/BugTracker-2014/Tests/temporary.Bug-3430.stable.err sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.stable.out sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out sql/test/BugTracker-2015/Tests/window_function_crash.Bug-3861.stable.out sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.sql sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.stable.err sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.stable.out sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.sql sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2018/Tests/All sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Dependencies/Tests/dependency_loop.stable.out sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 sql/test/Dependencies/dependency_DBobjects.sql sql/test/Dependencies/dependency_owner_schema_3.sql sql/test/Dump/Tests/All sql/test/Dump/Tests/dump-empty.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.out sql/test/LSST/Tests/schema_3_1_88.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out.int128 sql/test/Tests/comment-dump.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Update_Delete_action/Tests/delete_cascade.stable.out sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out sql/test/VOC/Tests/VOC.stable.out sql/test/Via-m/Tests/event_s01.stable.out sql/test/copy/Tests/ingestion.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 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/emptydb/Tests/load.stable.out sql/test/group-concat/Tests/groupconcat01.stable.out sql/test/json/Tests/spaceissue.stable.out sql/test/lateral/Tests/lateral.stable.out sql/test/mergetables/Tests/mergeinit.stable.out sql/test/mergetables/Tests/mergequery.stable.out sql/test/miscellaneous/Tests/trace_test.stable.out sql/test/orderidx/Tests/simpletable.sql sql/test/orderidx/Tests/simpletable.stable.out sql/test/orderidx/Tests/simpletable.stable.out.32bit sql/test/orderidx/Tests/smalltable.sql sql/test/orderidx/Tests/smalltable.stable.out sql/test/orderidx/Tests/smalltable.stable.out.32bit sql/test/pg_regress/Tests/vacuum.sql sql/test/pg_regress/Tests/vacuum.stable.out sql/test/quantiles/Tests/quantiles.stable.out sql/test/rdf/Tests/create_tables_t.stable.out sql/test/remote/Tests/All sql/test/remote/Tests/partition_elim.stable.out sql/test/remote/Tests/ssbm.SQL.py sql/test/snodgrass/Tests/cast_select.stable.out sql/test/ssqq/Tests/ssqq.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-load.stable.out testing/README testing/difflib.c Branch: data-vaults Log Message:
Merge with default diffs (truncated from 43886 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -695,3 +695,8 @@ 28edc063ceb6a3726af887911a3e4ac4a33c504f f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_3 28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_release f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_release +ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_5 +ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release +e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_7 +ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release +e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_SP1_release diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Fri May 25 2018 Ying Zhang <y.zh...@cwi.nl> +- Added a '-f rowcount' option in mclient to repress printing the actual + data of a resultset, but only print the number of returned tuples + * Tue Feb 13 2018 Pedro Ferreira <pedro.ferre...@monetdbsolutions.com> - Added support for lz4 compressed files on stream library diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Mar2018/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Mar2018-SP1/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist # we need checkpolicy and selinux-policy-devel for the SELinux policy @@ -640,7 +640,6 @@ fi %exclude %{_libdir}/monetdb5/fits.mal %exclude %{_libdir}/monetdb5/autoload/*_fits.mal %exclude %{_libdir}/monetdb5/createdb/*_fits.sql -%exclude %{_libdir}/monetdb5/lib_fits.so %endif %if %{?with_geos:1}%{!?with_geos:0} %exclude %{_libdir}/monetdb5/geom.mal @@ -674,25 +673,15 @@ fi %endif %exclude %{_libdir}/monetdb5/autoload/??_sql*.mal %{_libdir}/monetdb5/autoload/*.mal -%if %{?with_geos:1}%{!?with_geos:0} -%exclude %{_libdir}/monetdb5/lib_geom.so -%endif -%if %{?with_lidar:1}%{!?with_lidar:0} -%exclude %{_libdir}/monetdb5/lib_lidar.so -%endif -%if %{?with_pyintegration:1}%{!?with_pyintegration:0} -%exclude %{_libdir}/monetdb5/lib_pyapi.so -%endif -%if %{?with_rintegration:1}%{!?with_rintegration:0} -%exclude %{_libdir}/monetdb5/lib_rapi.so -%endif %if %{?with_samtools:1}%{!?with_samtools:0} %exclude %{_libdir}/monetdb5/bam.mal %exclude %{_libdir}/monetdb5/autoload/*_bam.mal -%exclude %{_libdir}/monetdb5/lib_bam.so %endif -%exclude %{_libdir}/monetdb5/lib_sql.so -%{_libdir}/monetdb5/*.so +%{_libdir}/monetdb5/lib_capi.so +%{_libdir}/monetdb5/lib_generator.so +%{_libdir}/monetdb5/lib_opt_sql_append.so +%{_libdir}/monetdb5/lib_udf.so +%{_libdir}/monetdb5/lib_vault.so %doc %{_mandir}/man1/mserver5.1.gz %dir %{_datadir}/doc/MonetDB %docdir %{_datadir}/doc/MonetDB @@ -1044,6 +1033,59 @@ done %postun -p /sbin/ldconfig %changelog +* Thu May 31 2018 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.29.7-20180531 +- Rebuilt. + +* Fri May 25 2018 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.29.5-20180525 +- Rebuilt. +- BZ#6562: Sqlitelogictest crash on group by query with not in operator +- BZ#6565: Sqlitelogictest crash on complex select query with coalesce + call +- BZ#6566: Sqlitelogictest unavailable calc.- MAL operations +- BZ#6568: Sqlitelogictest crash on complex case query +- BZ#6569: Sqlitelogictest select query with not between cause with + wrong results +- BZ#6570: Sqlitelogictest select coalesce undefined calc +- BZ#6572: ordered index Error in optimizer garbageCollector +- BZ#6573: Sqlitelogictest crash on complex select query with case + statement +- BZ#6574: server crashed could not find ordered index while creating + a table +- BZ#6576: Sqlitelogictest aritmetic expressions with negative numbers + handling +- BZ#6577: creating temp table kills performance of the original query +- BZ#6578: One two-tuple insert gives different results than two single + inserts +- BZ#6581: Join condition errors. +- BZ#6583: Fixed size string concatenation with integer results in fixed + size string of size 0 +- BZ#6584: SELECT FROM REMOTE TABLE WHERE IS NOT NULL produces wrong + result +- BZ#6585: Nested Merge tables cause an infinite loop in rel_optimizer +- BZ#6587: Sqlitelogictest crash on complex case statement +- BZ#6589: Sqlitelogictest crash on complex on complex expression +- BZ#6594: Sqlitelogictest crash on complex case statement +- BZ#6595: Remote decimal division triggers assertion / returns wrong + answer +- BZ#6598: Python 3.4 not supported (due to usage of Py_DecodeLocale) +- BZ#6600: Sqlitelogictest queries fail to execute +- BZ#6601: "where is null" clause on remote table causes problem with + next query +- BZ#6602: Sqlitelogictest wrong results in IN query +- BZ#6603: Sqlitelogictest: Aggregation query with distinct clause + produces duplicated rows + +* Thu May 17 2018 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> - 11.29.5-20180525 +- sql: Corrected the definition of view: sys.ids. + +* Tue Apr 3 2018 Sjoerd Mullender <sjo...@acm.org> - 11.29.5-20180525 +- buildtools: On Linux and Unix, try not to link to libraries multiple times: that + only causes the code (and worse, the variables in those libraries) to be + included multiple times. On Windows, we do need to link to libraries + multiple times (once for each DLL we create if the DLL references + anything from the library) but that doesn't cause the linked library + to be loaded multiple times. + * Tue Mar 27 2018 Sjoerd Mullender <sjo...@acm.org> - 11.29.3-20180327 - Rebuilt. - BZ#3824: Created table not visible from ODBC diff --git a/NT/Makefile b/NT/Makefile --- a/NT/Makefile +++ b/NT/Makefile @@ -26,7 +26,6 @@ install: targetdirs all $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" install $(INSTALL) .monetdb "$(sysconfdir)" $(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" diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py deleted file mode 100644 --- a/NT/mkgeomwxs.py +++ /dev/null @@ -1,143 +0,0 @@ -from __future__ import print_function - -# python mkgeomwxs.py VERSION makedefs.txt PREFIX > PREFIX/MonetDB5-Geom-Installer.wxs -# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch x64/x86 PREFIX/MonetDB5-Geom-Installer.wxs -# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03 -sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB5-Geom-Installer.wixobj - -import sys, os - -# doesn't change -upgradecode = {'x64': '{8E6CDFDE-39B9-43D9-97B3-2440C012845C}', - 'x86': '{92C89C36-0E86-45E1-B3D8-0D6C91108F30}'} - -def comp(features, id, depth, files): - indent = ' ' * depth - for f in files: - print('%s<Component Id="_%d" Guid="*">' % (indent, id)) - print('%s <File DiskId="1" KeyPath="yes" Name="%s" Source="%s"/>' % (indent, f.split('\\')[-1], f)) - print('%s</Component>' % indent) - features.append('_%d' % id) - id += 1 - return id - -def main(): - if len(sys.argv) != 4: - print(r'Usage: mkgeomwxs.py version makedefs.txt installdir') - return 1 - makedefs = {} - for line in open(sys.argv[2]): - key, val = line.strip().split('=', 1) - makedefs[key] = val - if makedefs['bits'] == '64': - folder = r'ProgramFiles64Folder' - arch = 'x64' - else: - folder = r'ProgramFilesFolder' - arch = 'x86' - vs = os.getenv('vs') # inherited from TestTools\common.bat - features = [] - print(r'<?xml version="1.0"?>') - print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>') - print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB" Name="MonetDB5 SQL GIS Module" UpgradeCode="%s" Version="%s">' % (upgradecode[arch], sys.argv[1])) - print(r' <Package Id="*" Comments="MonetDB5/SQL/GIS Module" Compressed="yes" InstallerVersion="301" Keywords="MonetDB5 MonetDB SQL GIS Database" Languages="1033" Manufacturer="MonetDB BV" Platform="%s"/>' % arch) - print(r' <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A later version of [ProductName] is already installed." AllowSameVersionUpgrades="no"/>') - print(r' <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/>') - print(r' <WixVariable Id="WixUIBannerBmp" Value="banner.bmp"/>') - # print(r' <WixVariable Id="WixUIDialogBmp" Value="backgroundRipple.bmp"/>') - print(r' <Property Id="INSTALLDIR">') - print(r' <RegistrySearch Id="MonetDBRegistry" Key="Software\[Manufacturer]\MonetDB5" Name="InstallPath" Root="HKLM" Type="raw"/>') - print(r' </Property>') - print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>') - print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>') - print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>') - print(r' <Condition Message="MonetDB5-SQL needs to be installed first.">') - print(r' INSTALLDIR') - print(r' </Condition>') - print(r' <Directory Id="TARGETDIR" Name="SourceDir">') - if vs == '17': - msvc = r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC' - d = sorted(os.listdir(msvc))[-1] - msm = '_CRT_%s.msm' % arch - for f in sorted(os.listdir(os.path.join(msvc, d, 'MergeModules'))): - if msm in f: - fn = f - print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="%s\%s\MergeModules\%s"/>' % (msvc, d, fn)) - else: - print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch)) - print(r' <Directory Id="%s">' % folder) - print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">') - print(r' <Directory Id="INSTALLDIR" Name="MonetDB5">') - id = 1 - print(r' <Directory Id="bin" Name="bin">') - id = comp(features, id, 14, - [r'%s\bin\geos_c.dll' % makedefs['LIBGEOS']]) - print(r' </Directory>') - print(r' <Directory Id="lib" Name="lib">') - print(r' <Directory Id="monetdb5" Name="monetdb5">') - print(r' <Directory Id="autoload" Name="autoload">') - id = comp(features, id, 18, - [r'lib\monetdb5\autoload\%s' % x for x in sorted(filter(lambda x: x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'autoload'))))]) - print(r' </Directory>') - print(r' <Directory Id="createdb" Name="createdb">') - id = comp(features, id, 18, - [r'lib\monetdb5\createdb\%s' % x for x in sorted(filter(lambda x: x.endswith('.sql') and ('geom' in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'createdb'))))]) - print(r' </Directory>') - id = comp(features, id, 16, - [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x: x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))]) - id = comp(features, id, 16, - [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x: x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom' in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))]) - print(r' </Directory>') - print(r' </Directory>') - print(r' </Directory>') - print(r' </Directory>') - print(r' </Directory>') - print(r' </Directory>') - print(r' <Feature Id="Complete" ConfigurableDirectory="INSTALLDIR" Title="MonetDB/SQL">') - for f in features: - print(r' <ComponentRef Id="%s"/>' % f) - print(r' <MergeRef Id="VCRedist"/>') - print(r' </Feature>') - # the <UI> section was lifted from - # ...\SDK\wixui\WixUI_InstallDir.wxs and modified to remove the - # InstallDirDlg subsection - # see http://wixtoolset.org/documentation/manual/v3/wixui/wixui_customizations.html - print(r' <UI Id="MyWixUI_InstallDir">') - print(r' <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8"/>') - print(r' <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12"/>') - print(r' <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes"/>') - print(r' <Property Id="DefaultUIFont" Value="WixUI_Font_Normal"/>') - print(r' <Property Id="WixUI_Mode" Value="InstallDir"/>') - print(r' <DialogRef Id="BrowseDlg"/>') - print(r' <DialogRef Id="DiskCostDlg"/>') - print(r' <DialogRef Id="ErrorDlg"/>') - print(r' <DialogRef Id="FatalError"/>') - print(r' <DialogRef Id="FilesInUse"/>') - print(r' <DialogRef Id="MsiRMFilesInUse"/>') - print(r' <DialogRef Id="PrepareDlg"/>') - print(r' <DialogRef Id="ProgressDlg"/>') - print(r' <DialogRef Id="ResumeDlg"/>') - print(r' <DialogRef Id="UserExit"/>') - print(r' <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>') - print(r' <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>') - print(r' <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>') - print(r' <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>') - print(r' <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>') - print(r' <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>') - print(r' <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">LicenseAccepted = "1"</Publish>') - print(r' <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="1">NOT Installed</Publish>') - print(r' <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>') - print(r' <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>') - print(r' <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>') - print(r' <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>') - print(r' <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>') - print(r' <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>') - print(r' <Property Id="ARPNOMODIFY" Value="1"/>') - print(r' </UI>') - print(r' <UIRef Id="WixUI_Common"/>') - print(r' <UIRef Id="MyWixUI_InstallDir"/>') - print(r' <UIRef Id="WixUI_ErrorProgressText"/>') - print(r' <Icon Id="monetdb.ico" SourceFile="monetdb.ico"/>') - print(r' </Product>') - print(r'</Wix>') - -main() diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -7,8 +7,15 @@ from __future__ import print_function import sys, os _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
