Changeset: fc02d1d42116 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc02d1d42116 Added Files: ChangeLog.Mar2018 README-Debian README-Fedora buildtools/ChangeLog.Mar2018 clients/ChangeLog.Mar2018 clients/mapilib/ChangeLog.Mar2018 clients/odbc/driver/ODBCQueries.h common/stream/ChangeLog.Mar2018 gdk/ChangeLog.Mar2018 geom/ChangeLog.Mar2018 monetdb5/ChangeLog.Mar2018 monetdb5/modules/mal/Tests/remote13.stable.err monetdb5/modules/mal/Tests/remote13.stable.out sql/ChangeLog.Mar2018 sql/scripts/21_dependency_views.sql sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64 sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64 sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.sql sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128 sql/test/BugTracker-2018/Tests/case_with_orderby_limit.Bug-6512.sql sql/test/BugTracker-2018/Tests/case_with_orderby_limit.Bug-6512.stable.err sql/test/BugTracker-2018/Tests/case_with_orderby_limit.Bug-6512.stable.out sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.sql sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.err sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.out sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.err sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.sql sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.stable.err sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.stable.out sql/test/BugTracker-2018/Tests/ilike.Bug-6547.sql sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.err sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.out sql/test/BugTracker-2018/Tests/insert-null-second-interval-0.Bug-6515.sql sql/test/BugTracker-2018/Tests/insert-null-second-interval-0.Bug-6515.stable.err sql/test/BugTracker-2018/Tests/insert-null-second-interval-0.Bug-6515.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-join-not-in.Bug-6519.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-join-not-in.Bug-6519.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-join-not-in.Bug-6519.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-group-by-having-in-count.Bug-6524.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-group-by-having-in-count.Bug-6524.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-group-by-having-in-count.Bug-6524.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-query.Bug-6545.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-in-query.Bug-6545.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-in-query.Bug-6545.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-with-division.Bug-6546.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-in-with-division.Bug-6546.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-in-with-division.Bug-6546.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-select-range-null.Bug-6514.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-select-range-null.Bug-6514.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-select-not-between.Bug-6511.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-select-not-between.Bug-6511.stable.out sql/test/BugTracker-2018/Tests/truncate_add_user.sql sql/test/BugTracker-2018/Tests/truncate_add_user.stable.err sql/test/BugTracker-2018/Tests/truncate_add_user.stable.out sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.reqtests sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.out sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.sql sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.err sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.out sql/test/BugTracker-2018/Tests/truncate_remove_user.sql sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.err sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.out sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.reqtests sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.out sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.reqtests sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.out sql/test/BugTracker-2018/Tests/update-with-correlated-subquery.Bug-6520.sql sql/test/BugTracker-2018/Tests/update-with-correlated-subquery.Bug-6520.stable.err sql/test/BugTracker-2018/Tests/update-with-correlated-subquery.Bug-6520.stable.out sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.sql sql/test/FeatureRequests/Tests/All sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-epilogue.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-epilogue.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-epilogue.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-epilogue.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.reqtests sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.err sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.out sql/test/Tests/comment-dump-cleanup.sql sql/test/Tests/copy-from-lz4.py sql/test/Tests/copy-from-lz4.stable.err sql/test/Tests/copy-from-lz4.stable.out sql/test/Tests/copy-into-lz4.sql.in sql/test/Tests/copy-into-lz4.stable.err sql/test/Tests/copy-into-lz4.stable.out sql/test/Tests/create-or-replace-triggers.sql sql/test/Tests/create-or-replace-triggers.stable.err sql/test/Tests/create-or-replace-triggers.stable.out sql/test/Tests/create-or-replace-views.sql sql/test/Tests/create-or-replace-views.stable.err sql/test/Tests/create-or-replace-views.stable.out sql/test/Tests/drop-function-if-exists.sql sql/test/Tests/drop-function-if-exists.stable.err sql/test/Tests/drop-function-if-exists.stable.out sql/test/Tests/drop-trigger-if-exists.sql sql/test/Tests/drop-trigger-if-exists.stable.err sql/test/Tests/drop-trigger-if-exists.stable.out sql/test/Tests/lz4-dump.sql sql/test/Tests/testlz4.lz4 sql/test/Tests/truncate-statements-extra.sql sql/test/Tests/truncate-statements-extra.stable.err sql/test/Tests/truncate-statements-extra.stable.out sql/test/Tests/truncate-statements.sql sql/test/Tests/truncate-statements.stable.err sql/test/Tests/truncate-statements.stable.out sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.stable.err sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 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/type.txt testing/ChangeLog.Mar2018 tools/merovingian/ChangeLog.Mar2018 Removed Files: sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows sql/test/testdb-upgrade/Tests/dump.stable.out.Windows sql/test/testdb/Tests/testdb-dump.stable.out.Windows Modified Files: .hgtags ChangeLog Makefile.ag MonetDB.spec NT/mkgeomwxs.py NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog-Archive buildtools/ChangeLog.Jul2017 buildtools/autogen/autogen/msc.py clients/ChangeLog clients/Makefile.ag clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/Tests/mclient-uri.SQL.bat clients/Tests/mclient-uri.SQL.sh clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/dump.c clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/mnc.c clients/mapiclient/msqldump.h clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/ChangeLog clients/mapilib/mapi.c clients/mapilib/mapi.h clients/mapilib/mapi.rc clients/odbc/driver/Makefile.ag clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCDbc.c clients/odbc/driver/ODBCDbc.h clients/odbc/driver/ODBCDesc.c clients/odbc/driver/ODBCEnv.c clients/odbc/driver/ODBCGlobal.h clients/odbc/driver/ODBCStmt.c clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLAllocConnect.c clients/odbc/driver/SQLAllocHandle.c clients/odbc/driver/SQLAllocStmt.c clients/odbc/driver/SQLBindCol.c clients/odbc/driver/SQLBindParameter.c clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLBulkOperations.c clients/odbc/driver/SQLCancel.c clients/odbc/driver/SQLCloseCursor.c clients/odbc/driver/SQLColAttribute.c clients/odbc/driver/SQLColAttributes.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLCopyDesc.c clients/odbc/driver/SQLDataSources.c clients/odbc/driver/SQLDescribeCol.c clients/odbc/driver/SQLDescribeParam.c clients/odbc/driver/SQLDisconnect.c clients/odbc/driver/SQLDriverConnect.c clients/odbc/driver/SQLEndTran.c clients/odbc/driver/SQLError.c clients/odbc/driver/SQLExecDirect.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLExtendedFetch.c clients/odbc/driver/SQLFetch.c clients/odbc/driver/SQLFetchScroll.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLFreeConnect.c clients/odbc/driver/SQLFreeEnv.c clients/odbc/driver/SQLFreeHandle.c clients/odbc/driver/SQLFreeStmt.c clients/odbc/driver/SQLGetConnectAttr.c clients/odbc/driver/SQLGetConnectOption.c clients/odbc/driver/SQLGetCursorName.c clients/odbc/driver/SQLGetData.c clients/odbc/driver/SQLGetDescField.c clients/odbc/driver/SQLGetDescRec.c clients/odbc/driver/SQLGetDiagField.c clients/odbc/driver/SQLGetDiagRec.c clients/odbc/driver/SQLGetEnvAttr.c clients/odbc/driver/SQLGetFunctions.c clients/odbc/driver/SQLGetInfo.c clients/odbc/driver/SQLGetStmtAttr.c clients/odbc/driver/SQLGetStmtOption.c clients/odbc/driver/SQLGetTypeInfo.c clients/odbc/driver/SQLMoreResults.c clients/odbc/driver/SQLNativeSql.c clients/odbc/driver/SQLNumParams.c clients/odbc/driver/SQLNumResultCols.c clients/odbc/driver/SQLParamData.c clients/odbc/driver/SQLParamOptions.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLPutData.c clients/odbc/driver/SQLRowCount.c clients/odbc/driver/SQLSetConnectAttr.c clients/odbc/driver/SQLSetConnectOption.c clients/odbc/driver/SQLSetCursorName.c clients/odbc/driver/SQLSetDescField.c clients/odbc/driver/SQLSetDescRec.c clients/odbc/driver/SQLSetEnvAttr.c clients/odbc/driver/SQLSetParam.c clients/odbc/driver/SQLSetPos.c clients/odbc/driver/SQLSetScrollOptions.c clients/odbc/driver/SQLSetStmtAttr.c clients/odbc/driver/SQLSetStmtOption.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c clients/odbc/driver/SQLTransact.c clients/odbc/driver/driver.rc clients/odbc/setup/drvcfg.h clients/odbc/winsetup/setup.rc common/stream/ChangeLog common/stream/stream.c common/stream/stream.h common/utils/mcrypt.c common/utils/msabaoth.c configure.ag debian/changelog gdk/ChangeLog gdk/Makefile.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atomic.h gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_interprocess.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_qsort.c gdk/gdk_select.c gdk/gdk_ssort_impl.h gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_utils.c gdk/gdk_utils.h gdk/libbat.rc geom/monetdb5/geom_upgrade.c libversions monetdb5/ChangeLog monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/rapi/converters.c.h monetdb5/mal/Tests/tst275.stable.out monetdb5/mal/mal_authorize.c monetdb5/mal/mal_client.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_readline.c monetdb5/mal/mal_resource.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mcurl.c monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/iterator.c monetdb5/modules/mal/language.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/mkey.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/pcre.mal monetdb5/modules/mal/profiler.c monetdb5/modules/mal/profiler.h monetdb5/modules/mal/profiler.mal monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/wlc.c monetdb5/modules/mal/wlc.mal monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_postfix.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/capi/cheader.h sql/backends/monet5/UDF/pyapi/emit.c sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal sql/backends/monet5/UDF/pyapi3/Makefile.ag sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out sql/backends/monet5/UDF/pyapi3/connection3.c sql/backends/monet5/UDF/pyapi3/conversion3.c sql/backends/monet5/UDF/pyapi3/emit3.c sql/backends/monet5/UDF/pyapi3/formatinput3.c sql/backends/monet5/UDF/pyapi3/pyapi3.c sql/backends/monet5/UDF/pyapi3/pyapi3.mal sql/backends/monet5/UDF/pyapi3/pyloader3.c sql/backends/monet5/UDF/pyapi3/pytypes3.c sql/backends/monet5/UDF/pyapi3/type_conversion3.c sql/backends/monet5/UDF/pyapi3/unicode3.c sql/backends/monet5/UDF/udf/udf.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_cat.h sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_fround_impl.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_rank.c 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_statement.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/sqlcatalog.mal sql/backends/monet5/vaults/bam/85_bam.sql sql/backends/monet5/vaults/netcdf/74_netcdf.sql sql/backends/monet5/vaults/netcdf/netcdf.c sql/backends/monet5/wlr.c sql/backends/monet5/wlr.mal sql/common/sql_keyword.c sql/common/sql_string.c sql/common/sql_string.h sql/include/sql_catalog.h sql/include/sql_mem.h sql/include/sql_relation.h sql/scripts/21_dependency_functions.sql sql/scripts/46_profiler.sql sql/scripts/51_sys_schema_extension.sql sql/scripts/97_comments.sql sql/scripts/Makefile.ag sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_partition.c sql/server/rel_psm.c sql/server/rel_psm.h sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_sequence.c sql/server/rel_trans.c sql/server/rel_updates.c sql/server/rel_updates.h sql/server/rel_xml.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_privileges.c sql/server/sql_scan.c sql/server/sql_symbol.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/sql_storage.h sql/storage/store.c sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out sql/test/BugTracker-2016/Tests/storagemodel.sql sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.sql sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out sql/test/BugTracker-2018/Tests/All sql/test/BugTracker/Tests/All sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out 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/DropCascade/Tests/drop_columns_cascade.stable.out sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out sql/test/Tests/All sql/test/Tests/comment-auth.stable.err sql/test/Tests/comment-auth.stable.out sql/test/Tests/comment-dump.SQL.py sql/test/Tests/comment-dump.sql sql/test/Tests/comment-dump.stable.out sql/test/Tests/comment-on.sql sql/test/Tests/comment-on.stable.out sql/test/Tests/keys.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Users/Tests/All sql/test/VOC/Tests/VOC.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-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.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/mapi/Tests/utf8test.SQL.py sql/test/mapi/Tests/utf8test.stable.out sql/test/mergetables/Tests/alter.stable.err sql/test/mergetables/Tests/mergequery.stable.out sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/create_view.stable.err sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/float8.stable.err.int128 sql/test/pg_regress/Tests/insert.stable.err sql/test/remote/Tests/partition_elim.stable.out sql/test/sql_xml/Tests/All sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.err 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.err 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-dump.stable.out sql/test/testdb/Tests/testdb-load.sql testing/ChangeLog testing/Mtest.py.in testing/README tools/merovingian/ChangeLog tools/merovingian/daemon/argvcmds.c tools/merovingian/daemon/client.c tools/merovingian/daemon/connections.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/handlers.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/multiplex-funnel.c tools/merovingian/daemon/proxy.c tools/merovingian/utils/control.c tools/merovingian/utils/database.c tools/merovingian/utils/properties.c tools/mserver/monet_version.c.in tools/mserver/mserver5.c tools/mserver/shutdowntest.c vertoo.data Branch: batcalc-candidates Log Message:
Merge with default branch. diffs (truncated from 451964 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -687,3 +687,6 @@ fce449d5af88de715fde36624815a56ef34c56bb 3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_SP2_release b9276cb02ced7d98bcb27b5e6df600b2791f1fcd Jul2017_11 b9276cb02ced7d98bcb27b5e6df600b2791f1fcd Jul2017_SP3_release +4fd4a5c7b66747468a2b41930d1b987a4b0efff4 Jul2017_13 +4fd4a5c7b66747468a2b41930d1b987a4b0efff4 Jul2017_SP4_release +a294cafd5cac3397e148032bee9d8efc89f5c82a Mar2018_root diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Tue Feb 13 2018 Pedro Ferreira <pedro.ferre...@monetdbsolutions.com> +- Added support for lz4 compressed files on stream library diff --git a/ChangeLog b/ChangeLog.Mar2018 copy from ChangeLog copy to ChangeLog.Mar2018 --- a/ChangeLog +++ b/ChangeLog.Mar2018 @@ -1,3 +1,40 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Wed Feb 14 2018 Stefan Manegold <stefan.maneg...@cwi.nl> +- mclient's executing time profiling options and output format have + been changed. Instead of implicitly via the "--interactive"/"-i" + option (or when using and interactive mclient console), execution time + profiling is now controlled via an explicit "--timer=timermode"/"-t + timermode" command-line option, or a "\t timermode" command in the + interactive mclient console. The default (also in the interactive + mclient console) is now timermode "none", i.e., no timing information + is given. Timermode "clock" activates client-side wall-clock timing + ("clk") in "human-friendly" format much like the interactive mode did + before. Timermode "performance" also provides detailed server-side + timings: "sql" is the time to parse the SQL query, optimize the + logical relational plan and create the initial physical (MAL) plan; + "opt" is the time to optimize the physical (MAL) plan; "run" is the + time to execute the physical (MAL) plan. With timermode "performance" + all server-side timings and the client-side wall-clock time are given + in milliseconds (ms). Note that the client-measured wall-clock time + "clk" is reported per query only when options "--interactive" or + "--echo" are used, because only then does mclient send individual + lines (statements) of the SQL script to the server. Otherwise, mclient + sends the SQL script in large(r) batch(es) to the server, and, thus, + only the total wall-clock time per batch is measured and reported. The + server-measured detailed performance timings "sql", "opt", "run" are + always measured and reported per query. Also, all timing information + is now given on a separate line and set to stderr rather than stdout. + +* Fri Feb 9 2018 Sjoerd Mullender <sjo...@acm.org> +- Some types and constants were moved from configure (and hence + monetdb_config.h) to gdk.h. In particular, the types "lng" and + "ulng" have been moved and can therefore no longer be used by code + that doesn't (ultimately) include gdk.h. Just use int64_t instead. + A bunch of format defines have been removed: SZFMT, SSZFMT, PTRFMT, + PDFMT. Just use the C standard codes for those (%zu, %zd, %p, %td). + The define for printing a lng (LLFMT) was also moved. Use PRId64 for + printing int64_t in code not using gdk.h. Removed all references to + __int64 and long long (use int64_t instead). + diff --git a/Makefile.ag b/Makefile.ag --- a/Makefile.ag +++ b/Makefile.ag @@ -13,7 +13,8 @@ SUBDIRS = buildtools common clients \ HAVE_TESTING?testing \ EXTRA_DIST = bootstrap configure configure.ac configure.ag libversions \ - MonetDB.spec rpm.mk.in COPYING README.rst license.txt HowToStart.rst + MonetDB.spec rpm.mk.in COPYING README.rst license.txt HowToStart.rst \ + README-Fedora README-Debian EXTRA_DIST_DIR = NT debian MacOSX diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.28.0 +%define version 11.30.0 %{!?buildno: %global buildno %(date +%Y%m%d)} # groups of related archs @@ -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/Jul2017-SP3/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Jul2017-SP4/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist # we need checkpolicy and selinux-policy-devel for the SELinux policy @@ -1046,6 +1046,54 @@ done %postun -p /sbin/ldconfig %changelog +* Fri Feb 02 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202 +- Rebuilt. +- BZ#3470: Support setClob without length restrictions +- BZ#6468: JDBC 2.27 fails with year < 1000 +- BZ#6482: Query failures on order by on union +- BZ#6483: Monetdb crashes, on query +- BZ#6487: UNION of NULLs with several tables fails +- BZ#6488: Semijoin returns duplicate values from a column with unique + values +- BZ#6489: Sqlitelogictest - Wrong result set of complex conditional query +- BZ#6490: Sqlitelogictest - Select query with an IN clause parse error +- BZ#6491: SELECT IN returns NULL instead of false when not found +- BZ#6492: Persistent hashes stored and then ignored. Storage info not + in sync with actual indices. +- BZ#6493: Sqlitelogictest - Aggregation query on empty table with + DISTINCT clause +- BZ#6494: Sqlitelogictest - Algebra operators priority in select query +- BZ#6495: Sqlitelogictest - Omitting AS in a result set column alias name +- BZ#6496: Sqlitelogictest - Select interval comparisons between + floating-points and NULL +- BZ#6497: Sqlitelogictest - Select not between query producing wrong + results +- BZ#6498: large virtual memory spike on BLOB column COUNT +- BZ#6499: Crash when trying to replace a function defined in sys from + a different schema +- BZ#6502: Query with multiple limit clauses does not return anything +- BZ#6508: Segmentation fault in mserver5 on Python2 UDF with TIMESTAMP + column input that has NULL values (conversion.c:438, PyNullMask_FromBAT) +- BZ#6510: Sqlitelogictest: Wrong output in aggregation query +- BZ#6512: Monetdb crashes on query with limit after sort with case +- BZ#6514: Sqlitelogictest: Range query between NULL values not possible +- BZ#6515: Insert null second interval value results in 0 +- BZ#6516: Sqlitelogictest unknown bat append operation +- BZ#6517: Sqlitelogictest overflow in conversion during MAL plan + execution +- BZ#6518: Sqlitelogictest: count aggregation with not in operator +- BZ#6519: Sqlitelogictest: algebra join between lng and int BATs + undefined +- BZ#6520: UPDATE with correlated subquery causes assertion (or segfault) +- BZ#6522: Sqlitelogictest: IN operator return a single column +- BZ#6523: Sqlitelogictest: Case statement subquery missing +- BZ#6524: Sqlitelogictest: Crash in aggregation query with IN operator +- BZ#6527: Crash using order by alias in subquery + +* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202 +- buildtools: Added the .lib and .h files needed for building extensions to the + Windows installer. + * Mon Dec 04 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.11-20171204 - Rebuilt. - BZ#3898: Deadlock on insertion diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py --- a/NT/mkgeomwxs.py +++ b/NT/mkgeomwxs.py @@ -83,7 +83,7 @@ def main(): 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') and ('geom' in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))]) + [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>') diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -67,10 +67,10 @@ def main(): id = 1 print(r' <Directory Id="lib" Name="lib">') id = comp(features, id, 14, - [r'lib\libmapi.dll', - r'lib\libMonetODBC.dll', - r'lib\libMonetODBCs.dll', - r'lib\libstream.dll', + [r'lib\libmapi.dll', r'lib\libmapi.pdb', + r'lib\libMonetODBC.dll', r'lib\libMonetODBC.pdb', + r'lib\libMonetODBCs.dll', r'lib\libMonetODBCs.pdb', + r'lib\libstream.dll', r'lib\libstream.pdb', r'%s\bin\iconv.dll' % makedefs['LIBICONV'], r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'], r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'], diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -74,14 +74,14 @@ def main(): id = 1 print(r' <Directory Id="bin" Name="bin">') id = comp(features, id, 14, - [r'bin\mclient.exe', - r'bin\mserver5.exe', - r'bin\msqldump.exe', - r'bin\stethoscope.exe', - r'lib\libbat.dll', - r'lib\libmapi.dll', - r'lib\libmonetdb5.dll', - r'lib\libstream.dll', + [r'bin\mclient.exe', r'bin\mclient.pdb', + r'bin\mserver5.exe', r'bin\mserver5.pdb', + r'bin\msqldump.exe', r'bin\msqldump.pdb', + r'bin\stethoscope.exe', r'bin\stethoscope.pdb', + r'lib\libbat.dll', r'lib\libbat.pdb', + r'lib\libmapi.dll', r'lib\libmapi.pdb', + r'lib\libmonetdb5.dll', r'lib\libmonetdb5.pdb', + r'lib\libstream.dll', r'lib\libstream.pdb', r'%s\bin\iconv.dll' % makedefs['LIBICONV'], r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'], r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'], @@ -96,9 +96,10 @@ def main(): print(r' <Directory Id="include" Name="include">') print(r' <Directory Id="monetdb" Name="monetdb">') id = comp(features, id, 16, - [r'include\monetdb\mapi.h', - r'include\monetdb\stream.h', - r'include\monetdb\stream_socket.h'], + sorted([r'include\monetdb\%s' % x for x in filter(lambda x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal')) and x.endswith('.h'), os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))] + + [r'include\monetdb\mapi.h', + r'include\monetdb\stream.h', + r'include\monetdb\stream_socket.h']), vital = 'no') print(r' </Directory>') print(r' </Directory>') @@ -115,10 +116,12 @@ def main(): id = comp(features, id, 16, [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x: x.endswith('.mal') and ('geom' not 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') and ('geom' not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))]) + [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' not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))]) print(r' </Directory>') id = comp(features, id, 14, - [r'lib\libmapi.lib', + [r'lib\libbat.lib', + r'lib\libmapi.lib', + r'lib\libmonetdb5.lib', r'lib\libstream.lib', r'%s\lib\iconv.lib' % makedefs['LIBICONV'], r'%s\lib\libbz2.lib' % makedefs['LIBBZIP2'], 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 @@ -71,6 +71,12 @@ #define NATIVE_WIN32 1 +#ifdef __INTEL_COMPILER +/* Definition of NAN is seriously broken on Intel compiler (at least + * in some versions), so we work around it. */ +#define NAN_CANNOT_BE_USED_AS_INITIALIZER +#endif + /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ @@ -295,9 +301,6 @@ /* Define to 1 if you have the `lockf' function. */ /* #undef HAVE_LOCKF */ -/* Define to 1 if the system has the type `long long'. */ -#define HAVE_LONG_LONG 1 - /* Define to 1 if you have the <mach/mach_init.h> header file. */ /* #undef HAVE_MACH_MACH_INIT_H */ @@ -586,9 +589,6 @@ /* Define to 1 if the system has the type `__int128_t'. */ /* #undef HAVE___INT128_T */ -/* Define to 1 if the system has the type `__int64'. */ -#define HAVE___INT64 1 - /* Define to 1 if the system has the type `__uint128_t'. */ /* #undef HAVE___UINT128_T */ @@ -666,7 +666,7 @@ #define PACKAGE_URL "https://www.monetdb.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "11.28.0" +#define PACKAGE_VERSION "11.30.0" /* Path separator */ #define PATH_SEP ';' @@ -686,11 +686,6 @@ /* The size of `long', as computed by sizeof. */ #define SIZEOF_LONG 4 -/* The size of `long long', as computed by sizeof. */ -#ifdef HAVE_LONG_LONG -#define SIZEOF_LONG_LONG 8 -#endif - /* The size of `ptrdiff_t', as computed by sizeof. */ #ifdef _WIN64 #define SIZEOF_PTRDIFF_T 8 @@ -887,19 +882,11 @@ c99_snprintf(char *outBuf, size_t size, /* Define to `int' if <sys/types.h> does not define. */ #ifdef _WIN64 -#define ssize_t __int64 +#define ssize_t int64_t _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list