Changeset: e86e7252e686 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e86e7252e686 Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/R/Tests/deps-install.timeout clients/mapilib/ChangeLog.Aug2018 clients/odbc/samples/testStmtAttr.c common/stream/ChangeLog.Aug2018 common/utils/strptime.cpp debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install gdk/ChangeLog.Aug2018 geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 sql/backends/monet5/UDF/capi/Tests/capi14.sql sql/backends/monet5/UDF/capi/Tests/capi14.stable.err sql/backends/monet5/UDF/capi/Tests/capi14.stable.out 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/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/sql_partition.c sql/server/sql_partition.h sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.sql sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.err sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.out sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.err sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.err sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.sql sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.err sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.out sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.sql sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.err sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.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.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/remote-table-where-not-equal.Bug-6621.py sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.err sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.out sql/test/BugTracker-2018/Tests/singleton-stddev.Bug-6627.sql sql/test/BugTracker-2018/Tests/singleton-stddev.Bug-6627.stable.err sql/test/BugTracker-2018/Tests/singleton-stddev.Bug-6627.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-rangejoin-undefined.Bug-6610.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-add.Bug-6630.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-add.Bug-6630.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-cast-null-add.Bug-6630.stable.out 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.sql 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/strptime.Bug-6626.sql sql/test/BugTracker-2018/Tests/strptime.Bug-6626.stable.err sql/test/BugTracker-2018/Tests/strptime.Bug-6626.stable.out sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql 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/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.sql sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.err sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.out sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.sql sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.err sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.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/Tests/copy-from-compressed.csv.bz2 sql/test/Tests/copy-from-compressed.csv.gz sql/test/Tests/copy-from-compressed.csv.raw sql/test/Tests/copy-from-compressed.csv.xz sql/test/Tests/copy-from-compressed.sql.in sql/test/Tests/copy-from-compressed.stable.err sql/test/Tests/copy-from-compressed.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.reqtests sql/test/emptydb-upgrade-chain/Tests/upgrade.reqtests sql/test/emptydb-upgrade-hge/Tests/upgrade.reqtests sql/test/emptydb-upgrade/Tests/upgrade.reqtests sql/test/merge-partitions/Tests/All sql/test/merge-partitions/Tests/mergepart00.sql sql/test/merge-partitions/Tests/mergepart00.stable.err sql/test/merge-partitions/Tests/mergepart00.stable.out sql/test/merge-partitions/Tests/mergepart01.sql sql/test/merge-partitions/Tests/mergepart01.stable.err sql/test/merge-partitions/Tests/mergepart01.stable.out sql/test/merge-partitions/Tests/mergepart02.sql sql/test/merge-partitions/Tests/mergepart02.stable.err sql/test/merge-partitions/Tests/mergepart02.stable.out sql/test/merge-partitions/Tests/mergepart03.sql sql/test/merge-partitions/Tests/mergepart03.stable.err sql/test/merge-partitions/Tests/mergepart03.stable.out sql/test/merge-partitions/Tests/mergepart04.sql sql/test/merge-partitions/Tests/mergepart04.stable.err sql/test/merge-partitions/Tests/mergepart04.stable.out sql/test/merge-partitions/Tests/mergepart05.sql sql/test/merge-partitions/Tests/mergepart05.stable.err sql/test/merge-partitions/Tests/mergepart05.stable.out sql/test/merge-partitions/Tests/mergepart06.sql sql/test/merge-partitions/Tests/mergepart06.stable.err sql/test/merge-partitions/Tests/mergepart06.stable.out sql/test/merge-partitions/Tests/mergepart07.sql sql/test/merge-partitions/Tests/mergepart07.stable.err sql/test/merge-partitions/Tests/mergepart07.stable.out sql/test/merge-partitions/Tests/mergepart08.sql sql/test/merge-partitions/Tests/mergepart08.stable.err sql/test/merge-partitions/Tests/mergepart08.stable.out sql/test/merge-partitions/Tests/mergepart09.sql sql/test/merge-partitions/Tests/mergepart09.stable.err sql/test/merge-partitions/Tests/mergepart09.stable.out sql/test/merge-partitions/Tests/mergepart10.sql sql/test/merge-partitions/Tests/mergepart10.stable.err sql/test/merge-partitions/Tests/mergepart10.stable.out sql/test/merge-partitions/Tests/mergepart11.sql sql/test/merge-partitions/Tests/mergepart11.stable.err sql/test/merge-partitions/Tests/mergepart11.stable.out sql/test/merge-partitions/Tests/mergepart12.sql sql/test/merge-partitions/Tests/mergepart12.stable.err sql/test/merge-partitions/Tests/mergepart12.stable.out sql/test/merge-partitions/Tests/mergepart13.sql sql/test/merge-partitions/Tests/mergepart13.stable.err sql/test/merge-partitions/Tests/mergepart13.stable.out sql/test/merge-partitions/Tests/mergepart14.sql sql/test/merge-partitions/Tests/mergepart14.stable.err sql/test/merge-partitions/Tests/mergepart14.stable.out sql/test/merge-partitions/Tests/mergepart15.sql sql/test/merge-partitions/Tests/mergepart15.stable.err sql/test/merge-partitions/Tests/mergepart15.stable.out sql/test/merge-partitions/Tests/mergepart16.sql sql/test/merge-partitions/Tests/mergepart16.stable.err sql/test/merge-partitions/Tests/mergepart16.stable.out sql/test/merge-partitions/Tests/mergepart17.sql sql/test/merge-partitions/Tests/mergepart17.stable.err sql/test/merge-partitions/Tests/mergepart17.stable.out sql/test/merge-partitions/Tests/mergepart18.sql sql/test/merge-partitions/Tests/mergepart18.stable.err sql/test/merge-partitions/Tests/mergepart18.stable.out sql/test/merge-partitions/Tests/mergepart19.sql sql/test/merge-partitions/Tests/mergepart19.stable.err sql/test/merge-partitions/Tests/mergepart19.stable.out sql/test/merge-partitions/Tests/mergepart20.sql sql/test/merge-partitions/Tests/mergepart20.stable.err sql/test/merge-partitions/Tests/mergepart20.stable.out sql/test/merge-partitions/Tests/mergepart21.sql sql/test/merge-partitions/Tests/mergepart21.stable.err sql/test/merge-partitions/Tests/mergepart21.stable.out sql/test/merge-partitions/Tests/mergepart22.sql sql/test/merge-partitions/Tests/mergepart22.stable.err sql/test/merge-partitions/Tests/mergepart22.stable.out sql/test/merge-partitions/Tests/mergepart23.py sql/test/merge-partitions/Tests/mergepart23.stable.err sql/test/merge-partitions/Tests/mergepart23.stable.out sql/test/merge-partitions/Tests/mergepart24.sql sql/test/merge-partitions/Tests/mergepart24.stable.err sql/test/merge-partitions/Tests/mergepart24.stable.out sql/test/merge-partitions/Tests/mergepart25.sql sql/test/merge-partitions/Tests/mergepart25.stable.err sql/test/merge-partitions/Tests/mergepart25.stable.out sql/test/merge-partitions/Tests/mergepart26.sql sql/test/merge-partitions/Tests/mergepart26.stable.err sql/test/merge-partitions/Tests/mergepart26.stable.out sql/test/merge-partitions/Tests/mergepart27.sql sql/test/merge-partitions/Tests/mergepart27.stable.err sql/test/merge-partitions/Tests/mergepart27.stable.out sql/test/merge-partitions/Tests/mergepart28.sql.in sql/test/merge-partitions/Tests/mergepart28.stable.err sql/test/merge-partitions/Tests/mergepart28.stable.out sql/test/miscellaneous/Tests/declared_tables.sql sql/test/miscellaneous/Tests/declared_tables.stable.err sql/test/miscellaneous/Tests/declared_tables.stable.out 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 sql/test/sys-schema/Tests/bam_tables_checks.sql sql/test/sys-schema/Tests/bam_tables_checks.stable.err sql/test/sys-schema/Tests/bam_tables_checks.stable.out sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.err sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out sql/test/sys-schema/Tests/geom_tables_checks.sql sql/test/sys-schema/Tests/geom_tables_checks.stable.err sql/test/sys-schema/Tests/geom_tables_checks.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 testing/ChangeLog.Aug2018 tools/merovingian/ChangeLog.Aug2018 tools/merovingian/daemon/config/.merovingian_properties.in tools/merovingian/daemon/config/Makefile.ag tools/merovingian/daemon/config/monetdbd.in tools/merovingian/daemon/config/monetdbd.service.in Removed Files: ChangeLog.Mar2018 NT/mkgeomwxs.py buildtools/ChangeLog.Mar2018 clients/ChangeLog.Mar2018 clients/mapilib/ChangeLog.Mar2018 common/stream/ChangeLog.Mar2018 common/utils/ChangeLog.Mar2018 common/utils/strptime.c debian/libmonetdb16.install gdk/ChangeLog.Mar2018 geom/ChangeLog.Mar2018 monetdb5/ChangeLog.Mar2018 sql/ChangeLog.Mar2018 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 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64 testing/ChangeLog.Mar2018 tools/merovingian/ChangeLog.Mar2018 tools/merovingian/daemon/.merovingian_properties.in tools/merovingian/daemon/monetdbd.service.in Modified Files: .hgtags ChangeLog MonetDB.spec NT/Makefile NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog buildtools/ChangeLog-Archive buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/filesplit.py buildtools/autogen/autogen/msc.py buildtools/doc/windowsbuild.rst buildtools/selinux/monetdb.te clients/ChangeLog clients/ChangeLog-Archive clients/R/Tests/dbapply.R clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/deps-test.timeout clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.err clients/R/Tests/install.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/C/Makefile.ag clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample4.c clients/examples/C/smack00.c clients/examples/C/smack01.c clients/mapiclient/Makefile.ag 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/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/mnc.c clients/mapiclient/msqldump.c clients/mapiclient/msqldump.h clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/ChangeLog clients/mapilib/Makefile.ag 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/ODBCStmt.c clients/odbc/driver/ODBCStmt.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLError.c clients/odbc/driver/SQLExecDirect.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLGetConnectAttr.c clients/odbc/driver/SQLGetDescRec.c clients/odbc/driver/SQLGetDiagField.c clients/odbc/driver/SQLGetDiagRec.c clients/odbc/driver/SQLGetInfo.c clients/odbc/driver/SQLGetStmtAttr.c clients/odbc/driver/SQLGetTypeInfo.c clients/odbc/driver/SQLSetStmtAttr.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/driver.rc clients/odbc/samples/Makefile.ag clients/odbc/samples/arraytest.c clients/odbc/samples/odbcsample1.c clients/odbc/samples/testgetinfo.c clients/odbc/winsetup/setup.rc clients/ruby/Tests/gemtest.stable.out common/stream/ChangeLog common/stream/ChangeLog-Archive common/stream/Makefile.ag common/stream/monetdb-stream.pc.in common/stream/stream.c common/stream/stream.h common/stream/stream_socket.h common/utils/Makefile.ag common/utils/mcrypt.c common/utils/msabaoth.c common/utils/mutils.c common/utils/mutils.h configure.ag debian/changelog debian/control debian/fix-deb.sh debian/monetdb5-server.install debian/monetdb5-sql.install debian/rules gdk/ChangeLog gdk/ChangeLog-Archive 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_calc.h gdk/gdk_cross.c gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_hash.h gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_sample.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h gdk/libbat.rc geom/lib/Makefile.ag geom/monetdb5/Makefile.ag 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/ChangeLog-Archive 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/extras/rapi/rapi.h monetdb5/mal/Tests/tst1150.malC monetdb5/mal/mal_authorize.c monetdb5/mal/mal_authorize.h monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_exception.h monetdb5/mal/mal_import.c 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_profiler.c monetdb5/mal/mal_readline.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_session.c monetdb5/mal/mal_session.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/color.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/str.c monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh monetdb5/modules/kernel/alarm.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/batmmath.mal monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/mmath.c monetdb5/modules/kernel/status.c monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/calc.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/manifold.c monetdb5/modules/mal/manual.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/mkey.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/projectionpath.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.c monetdb5/modules/mal/wlc.mal monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_jit.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_profiler.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_wrapper.c monetdb5/tools/Makefile.ag monetdb5/tools/libmonetdb5.rc monetdb5/tools/monetdb5.pc.in sql/ChangeLog sql/ChangeLog-Archive sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/optimizers.stable.out sql/backends/monet5/Tests/pyapi09.stable.out sql/backends/monet5/Tests/pyapi28.stable.out sql/backends/monet5/Tests/pyloader01.stable.out sql/backends/monet5/Tests/pyloader07.stable.out.32bit 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/pyapi/pyapi.c sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/UDF/pyapi/type_conversion.h sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/UDF/udf/udf.c sql/backends/monet5/generator/90_generator.sql sql/backends/monet5/generator/90_generator_hge.sql sql/backends/monet5/generator/Tests/generator00.stable.out sql/backends/monet5/generator/generator.mal sql/backends/monet5/generator/generator_hge.mal sql/backends/monet5/mal_backend.c sql/backends/monet5/mal_backend.h sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_assert.c 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_cat.h sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_result.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_statement.h 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/sqlcatalog.mal sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/vaults/bam/bam_export.c sql/backends/monet5/vaults/bam/bam_globals.c sql/backends/monet5/vaults/bam/bam_globals.h sql/backends/monet5/vaults/bam/bam_lib.c sql/backends/monet5/vaults/bam/bam_loader.c sql/backends/monet5/vaults/bam/bam_wrapper.c sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/lidar/lidar.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_changeset.c sql/common/sql_list.c sql/common/sql_mem.c sql/common/sql_types.c sql/common/sql_types.h sql/include/sql_catalog.h sql/include/sql_hash.h sql/include/sql_list.h sql/include/sql_mem.h sql/include/sql_relation.h sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/rel.txt sql/scripts/21_dependency_views.sql sql/scripts/22_clients.sql sql/scripts/51_sys_schema_extension.sql sql/scripts/99_system.sql sql/scripts/Makefile.ag sql/server/Makefile.ag sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_optimizer.h sql/server/rel_partition.c sql/server/rel_planner.c sql/server/rel_prop.c sql/server/rel_prop.h sql/server/rel_psm.c sql/server/rel_psm.h sql/server/rel_rel.c sql/server/rel_rel.h sql/server/rel_schema.c sql/server/rel_schema.h sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_semantic.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/server/rel_updates.h sql/server/sql_atom.c sql/server/sql_atom.h sql/server/sql_datetime.c sql/server/sql_decimal.c sql/server/sql_env.c sql/server/sql_env.h 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_semantic.c sql/server/sql_semantic.h 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/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugDay_2005-10-06_2.8/Tests/select_null.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out sql/test/BugTracker-2009/Tests/rollback_bug.stable.err sql/test/BugTracker-2009/Tests/temporary_table_leftover.SF-2734713.stable.err 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-2012/Tests/update_crash.Bug-2655.sql sql/test/BugTracker-2012/Tests/update_crash.Bug-2655.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/sql2pcre.Bug-3800.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/set-negative-querytimeout.Bug-6070.stable.err sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.err sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.out sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out sql/test/BugTracker-2018/Tests/All sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out 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-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/truncate_sys_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.out sql/test/BugTracker/Tests/case_in_aggr_bug.SF-1506545.sql sql/test/BugTracker/Tests/crash_on_fkey_update2.SF-1703497.stable.err 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/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/All sql/test/Tests/comment-dump.stable.out sql/test/Tests/fsum.sql sql/test/Tests/fsum.stable.out sql/test/Tests/ifexists.sql sql/test/Tests/ifexists.stable.err sql/test/Tests/seq-default.stable.out sql/test/Tests/setoptimizer.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/UserDump/Tests/create.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/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out sql/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err 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.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/emptydb/Tests/load.stable.out sql/test/group-concat/Tests/groupconcat01.stable.out sql/test/json/Tests/parsing.stable.err sql/test/json/Tests/spaceissue.stable.out sql/test/lateral/Tests/lateral.stable.out sql/test/mapi/Tests/php_monetdb.stable.out sql/test/mergetables/Tests/mergeinit.stable.out sql/test/mergetables/Tests/mergequery.stable.out sql/test/miscellaneous/Tests/All 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/All sql/test/pg_regress/Tests/update.stable.err sql/test/pg_regress/Tests/update.stable.out 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/seq-default.sql sql/test/snodgrass/Tests/cast_select.stable.out sql/test/ssqq/Tests/ssqq.stable.out sql/test/sys-schema/Tests/All 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.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/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/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/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.stable.out testing/ChangeLog testing/ChangeLog-Archive testing/Mfilter.py testing/Mtest.py.in testing/README testing/difflib.c testing/exportutils.py tools/merovingian/ChangeLog tools/merovingian/ChangeLog-Archive tools/merovingian/client/Makefile.ag tools/merovingian/client/monetdb.1 tools/merovingian/daemon/Makefile.ag tools/merovingian/daemon/client.c tools/merovingian/daemon/connections.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/merovingian/utils/utils.c tools/mserver/Makefile.ag tools/mserver/mserver5.1.in tools/mserver/mserver5.c tools/mserver/shutdowntest.c vertoo.config vertoo.data Branch: viewless Log Message:
merge with batcalc-candidates diffs (truncated from 172012 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -695,3 +695,20 @@ 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 +44182a802530768278cf750fd93c829acdde29f1 Aug2018_root +9c824ea44063e239b7251dce71f9af741c682211 Aug2018_1 +9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release +2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_3 +9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release +2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release +3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_5 +2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release +3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release +a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7 +3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release +a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,2 @@ # 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.Aug2018 copy from ChangeLog copy to ChangeLog.Aug2018 --- a/ChangeLog +++ b/ChangeLog.Aug2018 @@ -1,5 +1,2 @@ # 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.Mar2018 b/ChangeLog.Mar2018 deleted file mode 100644 --- a/ChangeLog.Mar2018 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for devel -# This file is updated with Maddlog - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,39 +1,39 @@ -%define name MonetDB -%define version 11.30.0 +%global name MonetDB +%global version 11.32.0 %{!?buildno: %global buildno %(date +%Y%m%d)} -# groups of related archs -%define all_x86 i386 i586 i686 - -%ifarch %{all_x86} -%define bits 32 -%else -%define bits 64 -%define with_int128 1 +# Use bcond_with to add a --with option; i.e., "without" is default. +# Use bcond_without to add a --without option; i.e., "with" is default. +# The --with OPTION and --without OPTION arguments can be passed on +# the commandline of both rpmbuild and mock. + +# On 64 bit architectures we build "hugeint" packages. +%if "%{?_lib}" == "lib64" +%bcond_without hugeint %endif -%define release %{buildno}%{?dist} +%global release %{buildno}%{?dist} # On RedHat Enterprise Linux and derivatives, if the Extra Packages -# for Enterprise Linux (EPEL) repository is available, you can define -# the _with_epel macro. When using mock to build the RPMs, this can -# be done using the --with=epel option to mock. -# If the EPEL repository is availabe, or if building for Fedora, all +# for Enterprise Linux (EPEL) repository is available, you can enable +# its use by providing rpmbuild or mock with the "--with epel" option. +# If the EPEL repository is availabe, or if building for Fedora, most # optional sub packages can be built. We indicate that here by # setting the macro fedpkgs to 1. If the EPEL repository is not # available and we are not building for Fedora, we set fedpkgs to 0. %if %{?rhel:1}%{!?rhel:0} # RedHat Enterprise Linux (or CentOS or Scientific Linux) -%if %{?_with_epel:1}%{!?_with_epel:0} +%bcond_with epel +%if %{with epel} # EPEL is enabled through the command line -%define fedpkgs 1 +%global fedpkgs 1 %else # EPEL is not enabled -%define fedpkgs 0 +%global fedpkgs 0 %endif %else # Not RHEL (so presumably Fedora) -%define fedpkgs 1 +%global fedpkgs 1 %endif # On Fedora, the geos library is available, and so we can require it @@ -45,7 +45,8 @@ # up-to-date version of RHEL. %if %{fedpkgs} %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -%define with_geos 1 +# By default create the MonetDB-geom-MonetDB5 package on Fedora and RHEL 7 +%bcond_without geos %endif %endif @@ -55,74 +56,49 @@ # available if EPEL is enabled, and then only on version 7. %if %{fedpkgs} %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -# If the _without_lidar macro is not set, the MonetDB-lidar RPM will -# be created. The macro can be set when using mock by passing it the -# flag --without=lidar. -%if %{?_without_lidar:0}%{!?_without_lidar:1} -%define with_lidar 1 -%endif +# By default create the MonetDB-lidar package on Fedora and RHEL 7 +%bcond_without lidar %endif %endif %if %{?rhel:0}%{!?rhel:1} -# If the _without_samtools macro is not set, the MonetDB-bam-MonetDB5 -# RPM will be created. The macro can be set when using mock by -# passing it the flag --without=samtools. +# By default create the MonetDB-bam-MonetDB5 package. # Note that the samtools-devel RPM is not available on RedHat # Enterprise Linux and derivatives, even with EPEL availabe. # (Actually, at the moment of writing, samtools-devel is available in # EPEL for RHEL 6, but not for RHEL 7. We don't make the distinction # here and just not build the MonetDB-bam-MonetDB5 RPM.) -%if %{?_without_samtools:0}%{!?_without_samtools:1} -%define with_samtools 1 +%bcond_without samtools %endif + +# By default use PCRE for the implementation of the SQL LIKE and ILIKE +# operators. Otherwise the POSIX regex functions are used. +%bcond_without pcre + +%if %{fedpkgs} +# By default, create the MonetDB-R package. +%bcond_without rintegration %endif -# If the _without_pcre macro is not set, the PCRE library is used for -# the implementation of the SQL LIKE and ILIKE operators. Otherwise -# the POSIX regex functions are used. The macro can be set when using -# mock by passing it the flag --without=pcre. -%if %{?_without_pcre:0}%{!?_without_pcre:1} -%define with_pcre 1 +# On Fedora and RHEL 7, create the MonetDB-python2 package. +# On RHEL 6, numpy is too old. +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +%bcond_without py2integration +%endif +%if %{?rhel:0}%{!?rhel:1} +# On RHEL 6, Python 3 is too old, and on RHEL 7, the default Python 3 +# is too old (in both cases 3.4). +%bcond_without py3integration %endif %if %{fedpkgs} -# If the _without_rintegration macro is not set, the MonetDB-R RPM -# will be created. The macro can be set when using mock by passing it -# the flag --without=rintegration. -%if %{?_without_rintegration:0}%{!?_without_rintegration:1} -%define with_rintegration 1 -%endif -%endif - -# If the _without_pyintegration macro is not set, the MonetDB-python2 -# RPM will be created. The macro can be set when using mock by -# passing it the flag --without=pyintegration. -# On RHEL 6, numpy is too old. -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -%if %{?_without_pyintegration:0}%{!?_without_pyintegration:1} -%define with_pyintegration 1 -%endif -%endif - -%if %{fedpkgs} -# If the _with_fits macro is set, the MonetDB-cfitsio RPM will be -# created. The macro can be set when using mock by passing it the -# flag --with=fits. -%if %{?_with_fits:1}%{!?_with_fits:0} -%define with_fits 1 -%endif +# By default, create the MonetDB-cfitsio package. +%bcond_without fits %endif %{!?__python2: %global __python2 %__python} %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%if 0%{?fedora} -%bcond_without python3 -%else -%bcond_with python3 -%endif - Name: %{name} Version: %{version} Release: %{release} @@ -132,7 +108,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/Aug2018/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist # we need checkpolicy and selinux-policy-devel for the SELinux policy @@ -143,40 +119,44 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel BuildRequires: hardlink %endif +BuildRequires: gcc BuildRequires: bison +%if %{?rhel:1}%{!?rhel:0} BuildRequires: bzip2-devel -%if %{?with_fits:1}%{!?with_fits:0} -BuildRequires: cfitsio-devel +%else +BuildRequires: pkgconfig(bzip2) %endif -BuildRequires: gcc -%if %{?with_geos:1}%{!?with_geos:0} +%if %{with fits} +BuildRequires: pkgconfig(cfitsio) +%endif +%if %{with geos} BuildRequires: geos-devel >= 3.4.0 %endif -%if %{?with_lidar:1}%{!?with_lidar:0} +%if %{with lidar} BuildRequires: liblas-devel >= 1.8.0 -BuildRequires: gdal-devel -BuildRequires: libgeotiff-devel -# Fedora 22 liblas-devel does not depend on liblas: -BuildRequires: liblas >= 1.8.0 +BuildRequires: pkgconfig(gdal) %endif -BuildRequires: libatomic_ops-devel -BuildRequires: libcurl-devel -BuildRequires: xz-devel +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +# RHEL >= 7, and all current Fedora +BuildRequires: pkgconfig(atomic_ops) +%endif +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(liblzma) # BuildRequires: libmicrohttpd-devel BuildRequires: libuuid-devel -BuildRequires: libxml2-devel -BuildRequires: openssl-devel -%if %{?with_pcre:1}%{!?with_pcre:0} -BuildRequires: pcre-devel >= 4.5 +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(openssl) +%if %{with pcre} +BuildRequires: pkgconfig(libpcre) >= 4.5 %endif BuildRequires: readline-devel BuildRequires: unixODBC-devel # BuildRequires: uriparser-devel -BuildRequires: zlib-devel -%if %{?with_samtools:1}%{!?with_samtools:0} +BuildRequires: pkgconfig(zlib) +%if %{with samtools} BuildRequires: samtools-devel %endif -%if %{?with_pyintegration:1}%{!?with_pyintegration:0} +%if %{with py2integration} BuildRequires: python-devel %if %{?rhel:1}%{!?rhel:0} # RedHat Enterprise Linux calls it simply numpy @@ -190,7 +170,11 @@ BuildRequires: numpy %endif %endif %endif -%if %{?with_rintegration:1}%{!?with_rintegration:0} _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list