MonetDB: cmake-monetdblite - Merge with cmake-fun

2019-10-18 Thread Pedro Ferreira 
Changeset: 37729cc92ec6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37729cc92ec6
Added Files:
monetdb5/modules/mal/Tests/flags.malC
monetdb5/modules/mal/Tests/flags.stable.err
monetdb5/modules/mal/Tests/flags.stable.out
sql/scripts/61_wlcr.sql

sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.sql
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.err
sql/test/BugTracker-2019/Tests/filter_json_null.Bug-6773.stable.out
sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py
sql/test/BugTracker-2019/Tests/next-get-value-bulk.Bug-6766.sql
sql/test/BugTracker-2019/Tests/next-get-value-bulk.Bug-6766.stable.out
sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.sql
sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.stable.err
sql/test/BugTracker-2019/Tests/prod-decimals.Bug-6774.stable.out
sql/test/Dependencies/Tests/view_table_udf.sql
sql/test/Dependencies/Tests/view_table_udf.stable.err
sql/test/Dependencies/Tests/view_table_udf.stable.out
sql/test/mergetables/Tests/sqlsmith-exists.sql
sql/test/miscellaneous/Tests/alter_table_add_column.sql
sql/test/miscellaneous/Tests/alter_table_add_column.stable.err
sql/test/miscellaneous/Tests/alter_table_add_column.stable.out
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/groupby_error.stable.err
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/subquery/Tests/exists.sql
sql/test/subquery/Tests/exists.stable.err
sql/test/subquery/Tests/exists.stable.out
sql/test/subquery/Tests/subquery3.sql
sql/test/subquery/Tests/subquery3.stable.err
sql/test/subquery/Tests/subquery3.stable.out
sql/test/wlcr/Tests/wlc80.py
sql/test/wlcr/Tests/wlr10.py
sql/test/wlcr/Tests/wlr10.stable.err
sql/test/wlcr/Tests/wlr10.stable.out
sql/test/wlcr/Tests/wlr80.py
Modified Files:
CMakeLists.txt
CMakeReadme.txt
ChangeLog
Makefile.ag
MonetDB.spec
NT/mkodbcwxs.py
NT/mksqlwxs.py
NT/rules.msc
buildtools/doc/HowToRelease.rst
buildtools/doc/windowsbuild.rst
clients/R/Tests/copy_into_fwf.stable.err
clients/R/Tests/dbi.stable.err
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/Tests/stethoscope--help.stable.err
clients/mapiclient/eventparser.c
clients/mapiclient/mhelp.c
clients/mapiclient/stethoscope.c
common/options/monet_options.c
configure.ag
debian/rules
embedded/MonetDBLiteReadme.txt
gdk/CMakeLists.txt
gdk/gdk.h
gdk/gdk_analytic_func.c
gdk/gdk_bat.c
gdk/gdk_logger.c
gdk/gdk_storage.c
gdk/gdk_system.h
gdk/gdk_utils.c
geom/CMakeLists.txt
geom/Makefile.ag
monetdb5/CMakeLists.txt
monetdb5/extras/rapi/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.stable.out
monetdb5/mal/Tests/tst907.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_embedded.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_exception.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
monetdb5/mal/mal_scenario.c
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/atoms/Tests/json02.stable.out
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/json.mal
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.h
monetdb5/modules/mal/clients.mal
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mdb.h
monetdb5/modules/mal/mdb.mal
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/profiler.mal
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/querylog.h
monetdb5/modules/mal/querylog

MonetDB: cmake-monetdblite - Merge with cmake-fun

2019-09-24 Thread Pedro Ferreira 
Changeset: 9c1145dcb5f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c1145dcb5f9
Added Files:
sql/test/BugTracker-2019/Tests/double-free.Bug-6757.sql
sql/test/BugTracker-2019/Tests/double-free.Bug-6757.stable.err
sql/test/BugTracker-2019/Tests/double-free.Bug-6757.stable.out
sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.err
sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.out
sql/test/BugTracker-2019/Tests/select-char.Bug-6761.sql
sql/test/BugTracker-2019/Tests/select-char.Bug-6761.stable.err
sql/test/BugTracker-2019/Tests/select-char.Bug-6761.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test1.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test1.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test1.timeout
sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test2.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test2.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test2.timeout
sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test3.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test3.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test3.timeout
sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test4.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test4.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test4.timeout
sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.bat
sql/test/SQLite_regress/sqllogictest/Tests/test5.SQL.sh
sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.err-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/test5.stable.out-noapprove
sql/test/SQLite_regress/sqllogictest/Tests/test5.timeout
sql/test/SQLite_regress/sqllogictest/sqllogictest.py
Removed Files:
sql/scripts/11_times.sql

sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128

sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128

sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128

sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128

sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128

sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out.int128

sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128

sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out.int128

sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out

sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out.int128
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out

sql/test/SQLite_r

MonetDB: cmake-monetdblite - Merge with cmake-fun

2019-09-10 Thread Pedro Ferreira 
Changeset: 24675ca9ea05 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24675ca9ea05
Added Files:
ChangeLog.Nov2019
buildtools/ChangeLog.Nov2019
clients/ChangeLog.Nov2019
clients/mapilib/ChangeLog.Nov2019
common/stream/ChangeLog.Nov2019
gdk/ChangeLog.Nov2019
geom/ChangeLog.Nov2019
monetdb5/ChangeLog.Nov2019
sql/ChangeLog.Nov2019
sql/jdbc/tests/Tests/JdbcClient_create_tables.sql
sql/jdbc/tests/Tests/JdbcClient_drop_tables.sql
sql/jdbc/tests/Tests/JdbcClient_inserts_selects.sql
sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.sql
sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.stable.err
sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.stable.out
sql/test/BugTracker-2019/Tests/merge-table-limit.Bug-6756.sql
sql/test/BugTracker-2019/Tests/merge-table-limit.Bug-6756.stable.err
sql/test/BugTracker-2019/Tests/merge-table-limit.Bug-6756.stable.out
testing/ChangeLog.Nov2019
tools/merovingian/ChangeLog.Nov2019
Removed Files:
sql/jdbc/tests/JdbcClient_create_tables.sql
sql/jdbc/tests/JdbcClient_inserts_selects.sql
Modified Files:
.hgtags
CMakeLists.txt
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
embedded/CMakeLists.txt
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_analytic_func.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_calc_compare.h
gdk/gdk_calc_private.h
gdk/gdk_cand.c
gdk/gdk_cand.h
gdk/gdk_cross.c
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_private.h
gdk/gdk_project.c
gdk/gdk_search.c
gdk/gdk_select.c
gdk/gdk_string.c
gdk/gdk_system.c
gdk/gdk_unique.c
gdk/gdk_utils.c
gdk/libbat.rc
monetdb5/ChangeLog
monetdb5/mal/Tests/tst670.stable.err
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/batmmath.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/01_calc.mal
monetdb5/modules/mal/01_calc.mal.sh
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mat.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/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_wlc.c
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_generator.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/wlr.c
sql/common/sql_types.c
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
sql/scripts/25_debug.sql
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/storage/sql_storage.h
sql/storage/store.c

sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err

sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out

sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err

sql/test/BugTracker-2015/Tests/backslash_predecing_separator.Bug-3775.stable.err

sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496.sql

sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-flo

MonetDB: cmake-monetdblite - Merge with cmake-fun

2019-09-03 Thread Pedro Ferreira 
Changeset: 31d248726337 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31d248726337
Added Files:
sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py

sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.stable.err

sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.stable.out

sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
Modified Files:
.hgtags
CMakeLists.txt
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/Tests/exports.stable.out
clients/mapilib/mapi.rc
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
debian/fix-deb.sh
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_group.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_private.h
gdk/gdk_unique.c
gdk/gdk_utils.c
gdk/libbat.rc
libversions
monetdb5/mal/mal_import.c
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/wlc.c
monetdb5/modules/mal/wlc.h
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Apr2019
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/wlr.c
sql/jdbc/tests/JdbcClient_create_tables.sql
sql/jdbc/tests/JdbcClient_inserts_selects.sql
sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_utils.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257-src.sql

sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.stable.out

sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err

sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
sql/test/BugTracker-2019/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128

sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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
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/subquery/Tests/correlated.sql
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
vertoo.data
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun


diffs (truncated from 3152 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -730,3 +730,9 @@ 2366418b3d88b268117a6f981638c4da686497aa
 02147798590c5f9d7c837bec07277313c1fa29cc Apr2019_7
 2366418b3d88b268117a6f981638c4da686497aa Apr2019_SP1_release
 02147798590c5f9d7c837bec07277313c1fa29cc Apr2019_SP1_release
+a6674f7048a13fe7dc53995a4f723d33a34bce23 Apr2019_9
+02147798590c5f9d7c837bec07277313c1fa29cc Apr2019_SP1_release
+a6674f7048a13fe7dc53995a4f723d33a34bce23 Apr2019_SP1_release
+6566d90185b83ed95129db9ea68baf52f2de5cc7 Apr2019_11
+a6674f7048a13fe7dc53995a4f723d33a34bce23 Apr2019_SP1_release
+6566d90185b83ed95129db9ea68baf52f2de5cc7 Apr2019_SP1_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,13 +21,13 @@ set(MONETDB_VERSION_PATCH "0")
 set(MONETDB_VERSION 
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH

MonetDB: cmake-monetdblite - Merge with cmake-fun

2019-08-19 Thread Pedro Ferreira 
Changeset: f5c20c354d4e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5c20c354d4e
Added Files:
sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.sql

sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.stable.err

sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.stable.out
sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.sql
sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.stable.err
sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.stable.out
sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.sql
sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.stable.err
sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.stable.out
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/utils/msabaoth.c
common/utils/msabaoth.h
configure.ag
debian/changelog
embedded/monetdb_embedded.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_select.c
gdk/libbat.rc
monetdb5/mal/mal.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/uuid.mal
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/atoms/xml.mal
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/server/rel_dump.c
sql/server/rel_propagate.c
sql/server/rel_schema.c
sql/server/rel_sequence.c
sql/server/rel_updates.c
sql/server/rel_updates.h
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
sql/storage/store.c

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.stable.out
sql/test/BugTracker-2019/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128

sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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
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/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/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlc01.stable.out
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlc100.stable.out
sql/test/wlcr/Tests/wlc20.py
sql/test/wlcr/Tests/wlc20.stable.out
sql/test/wlcr/Tests/wlc21.py
sql/test/wlcr/Tests/wlc21.stable.out
sql/test/wlcr/Tests/wlc30.py
sql/test/wlcr/Tests/wlc30.stable.out
sql/test/wlcr/Tests/wlc40.py
sql/test/wlcr/Tests/wlc40.stable.out
sql/test/wlcr/Tests/wlc50.py
sql/test/wlcr/Tests/wlc50.stable.out
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlc70.stable.out
tools/mserver/mserver5.c
vertoo.data
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun


diffs (truncated from 3757 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -727,3 +727,6 @@ 643dfa328c71d7891c8358b4969aa9ebf81e0f4c
 2c9089e1dde297caaf347bf27f88b10e5622a735 Apr2019_release
 2366418b3d88b268117a6f981638c4da686497aa Apr2019_5
 2366418b3d88b268117a6f981638c4da686497aa Apr2019_SP1_release
+02147798590c5f9d7c837bec07277313c1fa29cc Apr2019_7
+2366418b3d88b268117a6f981638c4da686497aa Apr2019_SP1_release
+02147798590c5f9d7c837bec07277313c1fa29cc Apr2019_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
---

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-08-07 Thread Pedro Ferreira 
Changeset: 035d11ea89d9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=035d11ea89d9
Added Files:
sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.sql
sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.stable.err
sql/test/BugTracker-2019/Tests/slow-inner-join.Bug-6737.stable.out
sql/test/rename/Tests/rename11.py
sql/test/rename/Tests/rename11.stable.err
sql/test/rename/Tests/rename11.stable.out
Modified Files:
.hgtags
CMakeLists.txt
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Apr2019
buildtools/selinux/monetdb.te
clients/examples/C/CMakeLists.txt
clients/mapiclient/CMakeLists.txt
clients/mapilib/CMakeLists.txt
clients/mapilib/mapi.c
clients/mapilib/mapi.rc
clients/odbc/driver/CMakeLists.txt
clients/odbc/driver/driver.rc
clients/odbc/winsetup/CMakeLists.txt
clients/odbc/winsetup/setup.rc
common/options/CMakeLists.txt
common/stream/CMakeLists.txt
common/utils/CMakeLists.txt
configure.ag
debian/changelog
embedded/CMakeLists.txt
gdk/CMakeLists.txt
gdk/ChangeLog-Archive
gdk/ChangeLog.Apr2019
gdk/gdk_system.c
gdk/gdk_utils.c
gdk/libbat.rc
geom/monetdb5/CMakeLists.txt
libversions
monetdb5/CMakeLists.txt
monetdb5/extras/mal_optimizer_template/CMakeLists.txt
monetdb5/extras/rapi/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/mal/CMakeLists.txt
monetdb5/optimizer/CMakeLists.txt
monetdb5/optimizer/opt_mergetable.c
monetdb5/scheduler/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
monetdb5/tools/Tests/mserver5--help.stable.err
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
monetdb5/tools/libmonetdb5.rc
sql/CMakeLists.txt
sql/ChangeLog-Archive
sql/ChangeLog.Apr2019
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
sql/backends/monet5/UDF/udf/CMakeLists.txt
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/CMakeLists.txt
sql/backends/monet5/vaults/fits/CMakeLists.txt
sql/backends/monet5/vaults/lidar/CMakeLists.txt
sql/backends/monet5/vaults/netcdf/CMakeLists.txt
sql/backends/monet5/vaults/shp/CMakeLists.txt
sql/common/CMakeLists.txt
sql/include/CMakeLists.txt
sql/server/CMakeLists.txt
sql/server/rel_rel.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/storage/CMakeLists.txt
sql/storage/bat/CMakeLists.txt
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
sql/storage/bat/bat_utils.c
sql/storage/bat/bat_utils.h
sql/storage/store.c

sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.sql

sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
sql/test/BugTracker-2019/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128

sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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/rename/Tests/All
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
testing/monet_options.py.in
tools/merovingian/client/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
tools/merovingian/utils/CMakeLists.txt
tools/mser

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-07-30 Thread Pedro Ferreira 
Changeset: 50f608b105ee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50f608b105ee
Added Files:
sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.SQL.bat
sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.SQL.sh
sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.err
sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.sql
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.err
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out.int128
sql/test/Tests/window_functions.sql
sql/test/Tests/window_functions.stable.err
sql/test/Tests/window_functions.stable.out
sql/test/pg_regress/Tests/vacuum.stable.out.single
Modified Files:
MonetDB.spec
clients/mapiclient/mclient.1
clients/mapiclient/msqldump.1
debian/control
gdk/gdk_aggr.c
gdk/gdk_join.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_storage.c
gdk/gdk_system.h
monetdb5/modules/mal/00_batcalc_hge.mal
monetdb5/modules/mal/00_batcalc_hge.mal.sh
monetdb5/modules/mal/batmtime.mal
monetdb5/modules/mal/batmtime.mal.sh
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_garbageCollector.c
sql/backends/monet5/UDF/capi/Tests/capi11.sql
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_rank.mal
sql/backends/monet5/sql_rank.mal.sh
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/jdbc/tests/Tests/All
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_mvc.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out

sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out

sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out

sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.out
sql/test/BugTracker-2019/Tests/All

sql/test/BugTracker-2019/Tests/select_window_function_and_asterisk.Bug-6722.stable.out
sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.sql
sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
sql/test/Tests/All
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun.


diffs (truncated from 4021 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -190,7 +190,7 @@ Suggests: %{name}-client%{?_isa} = %{ver
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators.  It also has an SQL frontend.
+accelerators.  It also has an SQL front end.
 
 This package contains the core components of MonetDB in the form of a
 single shared library.  If you want to use MonetDB, you will certainly
@@ -213,7 +213,7 @@ Requires: %{name}-stream-devel%{?_isa} =
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators.  It also has an SQL frontend.
+accelerators.  It also has an SQL front end.
 
 This package contains files needed to develop extensions to the core
 functionality of MonetDB.
@@ -235,7 +235,7 @@ Group: Applications/Databases
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators.  It also has an SQL frontend.
+accelerators.  It also has an SQL front end.
 
 This package contains a shared library (libstream) which is needed by
 various other components.
@@ -257,7 +257,7 @@ Requires: zlib-devel
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators.  It also has an SQL frontend.
+accelerators.  It also has an SQL front end.
 
 This package contains the files to develop with the %{name}-stream
 library.
@@ -281,7 +281,7 @@ Recommends: %{name}-SQL-server5%{?_isa} 
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibi

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-07-23 Thread Pedro Ferreira 
Changeset: 741c94abe09d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=741c94abe09d
Added Files:
sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.sql
sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.err
sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
gdk/gdk_bbp.c
gdk/gdk_system.c
gdk/gdk_system.h
monetdb5/mal/mal_instruction.c
monetdb5/modules/mal/mal_mapi.c
sql/backends/monet5/UDF/capi/Tests/capi09.stable.out
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/wlr.c
sql/include/sql_relation.h
sql/scripts/25_debug.sql
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_propagate.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_mvc.h
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128

sql/test/BugTracker-2012/Tests/order_by_on_column_exp.Bug-3193.stable.out
sql/test/BugTracker-2013/Tests/restore-uuid.Bug-3407.stable.out

sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.out
sql/test/BugTracker-2014/Tests/groupby_distict.Bug-3423.stable.out
sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.stable.out
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out
sql/test/BugTracker-2015/Tests/uuid-compare.Bug-3827.stable.out

sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out

sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128
sql/test/BugTracker-2016/Tests/isaUUID_function.Bug-3997.stable.out

sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.out

sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out

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.stable.out
sql/test/BugTracker-2019/Tests/All

sql/test/BugTracker-2019/Tests/merge-statement-aliases.Bug-6715.stable.err

sql/test/BugTracker-2019/Tests/merge-statement-aliases.Bug-6715.stable.out

sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out.int128

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-2join-query.stable.out

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-1join-query.stable.out

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.stable.out

sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128

sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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.

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-07-19 Thread Pedro Ferreira 
Changeset: a0a80d9277ec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0a80d9277ec
Modified Files:
clients/mapiclient/mclient.c
clients/mapiclient/stethoscope.c
clients/mapilib/mapi.rc
common/utils/matomic.h
gdk/gdk_atoms.h
monetdb5/mal/mal_profiler.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/merge-partitions/Tests/All
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun.


diffs (truncated from 614 to 300 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1479,25 +1479,26 @@ SQLrenderer(MapiHdl hdl)
char *s;
 
len[i] = mapi_get_len(hdl, i);
-   if (len[i] == 0 &&
-   ((s = mapi_get_type(hdl, i)) == NULL ||
-(strcmp(s, "varchar") != 0 &&
- strcmp(s, "clob") != 0 &&
- strcmp(s, "char") != 0 &&
- strcmp(s, "str") != 0 &&
- strcmp(s, "json") != 0))) {
-   /* no table width known, use maximum, rely on
-* squeezing later on to fix it to whatever is
-* available; note that for a column type of
-* varchar, 0 means the complete column is
-* NULL or empty string, so MINCOLSIZE (below)
-* will work great */
-   len[i] = pagewidth <= 0 ? DEFWIDTH : pagewidth;
-   } else if (len[i] == 0 &&
-  strcmp(mapi_get_type(hdl, i), "uuid") == 0) {
-   /* we know how large the UUID representation
-* is, even if the server doesn't */
-   len[i] = 36;
+   if (len[i] == 0) {
+   if ((s = mapi_get_type(hdl, i)) == NULL ||
+   (strcmp(s, "varchar") != 0 &&
+strcmp(s, "clob") != 0 &&
+strcmp(s, "char") != 0 &&
+strcmp(s, "str") != 0 &&
+strcmp(s, "json") != 0)) {
+   /* no table width known, use maximum,
+* rely on squeezing later on to fix
+* it to whatever is available; note
+* that for a column type of varchar,
+* 0 means the complete column is NULL
+* or empty string, so MINCOLSIZE
+* (below) will work great */
+   len[i] = pagewidth <= 0 ? DEFWIDTH : pagewidth;
+   } else if (strcmp(s, "uuid") == 0) {
+   /* we know how large the UUID representation
+* is, even if the server doesn't */
+   len[i] = 36;
+   }
}
if (len[i] < MINCOLSIZE)
len[i] = MINCOLSIZE;
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -242,16 +242,21 @@ usageStethoscope(void)
 static void
 stopListening(int i)
 {
-   fprintf(stderr,"signal %d received\n",i);
+   fprintf(stderr,"stethoscope: signal %d received\n",i);
if( dbh)
doQ("profiler.stop();");
 stop_disconnect:
// show follow up action only once
-   if(trace)
-   fclose(trace);
+   /*
+   if(trace) {
+   fflush(trace);
+   int res = fclose(trace);
+   assert(res==0);
+   }
+   */
if(dbh)
mapi_disconnect(dbh);
-   exit(0);
+   /* exit(0); */
 }
 
 int
@@ -389,7 +394,7 @@ main(int argc, char **argv)
 #endif
signal(SIGINT, stopListening);
signal(SIGTERM, stopListening);
-   close(0);
+   /* close(0); */
 
if (user == NULL)
user = simple_prompt("user", BUFSIZ, 1, prompt_getlogin());
@@ -418,7 +423,7 @@ main(int argc, char **argv)
fprintf(stderr,"-- %s\n",buf);
doQ(buf);
 
-   snprintf(buf, BUFSIZ, " profiler.openstream(%d);", stream_mode);
+   snprintf(buf, BUFSIZ, "profiler.openstream(%d);", stream_mode);
if( debug)
fprintf(stderr,"--%s\n",buf);

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-07-17 Thread Pedro Ferreira 
Changeset: cab891fdff96 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cab891fdff96
Added Files:
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.malC
sql/benchmarks/ATIS/Tests/load.options5
sql/benchmarks/arno/Tests/insert_ATOM.options5
sql/benchmarks/arno/Tests/insert_BOND.options5
sql/benchmarks/arno_flt/Tests/doAll.options5
sql/benchmarks/arno_flt/Tests/doAll_sorted.options5
sql/benchmarks/arno_flt/Tests/init.options5
sql/benchmarks/moa/Tests/load.options5
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.sql
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.err
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.out
sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.sql

sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.err

sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.out
Removed Files:
monetdb5/mal/Tests/blkjoin.mal
monetdb5/mal/Tests/bloom.mal
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.mal
sql/benchmarks/ATIS/Tests/load.prologue5
sql/benchmarks/arno/Tests/insert_ATOM.prologue5
sql/benchmarks/arno/Tests/insert_BOND.prologue5
sql/benchmarks/arno_flt/Tests/doAll.prologue5
sql/benchmarks/arno_flt/Tests/doAll_sorted.prologue5
sql/benchmarks/arno_flt/Tests/init.prologue5
sql/benchmarks/moa/Tests/load.prologue5
Modified Files:
CMakeLists.txt
HowToStart.rst
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog.Apr2019
clients/R/Tests/deps-install.timeout
clients/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
common/options/monet_options.c
configure.ag
debian/control
debian/fix-deb.sh
debian/monetdb-testing-python.install
debian/rules
gdk/ChangeLog.Apr2019
gdk/gdk_bat.c
gdk/gdk_logger.c
gdk/gdk_select.c
gdk/gdk_system.h
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/modules/atoms/Tests/All
monetdb5/modules/atoms/uuid.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/wlc.c
monetdb5/tools/Tests/mserver5--help.stable.err
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
sql/ChangeLog
sql/backends/monet5/Tests/All
sql/backends/monet5/UDF/Makefile.ag
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi/Tests/All
sql/backends/monet5/UDF/pyapi3/Tests/All
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.stable.err
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.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_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_transaction.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/wlr.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/scripts/25_debug.sql
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_privileges.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2018/Tests/All

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.stable.out
sql/test/BugTracker-2019/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128

sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
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-upgra

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-07-10 Thread Pedro Ferreira 
Changeset: 597a8c9ca507 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=597a8c9ca507
Added Files:
gdk/gdk_cand.c
sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.sql

sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.stable.err

sql/test/BugTracker-2019/Tests/copy-into-unicode-quote.Bug-6716.stable.out

sql/test/BugTracker-2019/Tests/disallow_duplicate_column_aliases.Bug-6723.sql

sql/test/BugTracker-2019/Tests/disallow_duplicate_column_aliases.Bug-6723.stable.err

sql/test/BugTracker-2019/Tests/disallow_duplicate_column_aliases.Bug-6723.stable.out
sql/test/BugTracker-2019/Tests/insert-into-select.Bug-6718.sql
sql/test/BugTracker-2019/Tests/insert-into-select.Bug-6718.stable.err
sql/test/BugTracker-2019/Tests/insert-into-select.Bug-6718.stable.out

sql/test/BugTracker-2019/Tests/prepare-non-existing-function.Bug-6725.sql

sql/test/BugTracker-2019/Tests/prepare-non-existing-function.Bug-6725.stable.err

sql/test/BugTracker-2019/Tests/prepare-non-existing-function.Bug-6725.stable.out
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.sql
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.err
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.out

sql/test/BugTracker-2019/Tests/select_window_function_and_asterisk.Bug-6722.sql

sql/test/BugTracker-2019/Tests/select_window_function_and_asterisk.Bug-6722.stable.err

sql/test/BugTracker-2019/Tests/select_window_function_and_asterisk.Bug-6722.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mhelp.c
embedded/CMakeLists.txt
gdk/CMakeLists.txt
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_batop.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_select.c
gdk/gdk_unique.c
monetdb5/ChangeLog
monetdb5/mal/mal_import.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
sql/backends/monet5/sql.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
sql/backends/monet5/wlr.c
sql/include/sql_catalog.h
sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_qc.c
sql/server/sql_qc.h
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
sql/storage/store.c
sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out

sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out

sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows

sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
sql/test/BugTr

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-06-17 Thread Pedro Ferreira 
Changeset: d92584311e0a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d92584311e0a
Added Files:

sql/test/BugTracker-2019/Tests/correlated-subquery-aggregation.Bug-6714.sql

sql/test/BugTracker-2019/Tests/correlated-subquery-aggregation.Bug-6714.stable.err

sql/test/BugTracker-2019/Tests/correlated-subquery-aggregation.Bug-6714.stable.out
sql/test/BugTracker-2019/Tests/merge-statement-aliases.Bug-6715.sql

sql/test/BugTracker-2019/Tests/merge-statement-aliases.Bug-6715.stable.err

sql/test/BugTracker-2019/Tests/merge-statement-aliases.Bug-6715.stable.out
sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.sql
sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.err
sql/test/BugTracker-2019/Tests/view-where-cast-error.Bug-6712.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/check.timeout
sql/test/emptydb-upgrade-chain/Tests/check.timeout
sql/test/emptydb-upgrade-hge/Tests/check.timeout
sql/test/emptydb-upgrade/Tests/check.timeout
sql/test/emptydb/Tests/check.timeout
Removed Files:
monetdb5/mal/Tests/tst1201.malC
monetdb5/mal/Tests/tst1201.stable.err
monetdb5/mal/Tests/tst1201.stable.out
monetdb5/mal/Tests/tst1202.malC
monetdb5/mal/Tests/tst1202.stable.err
monetdb5/mal/Tests/tst1202.stable.out
monetdb5/mal/Tests/tst1203.malC
monetdb5/mal/Tests/tst1203.stable.err
monetdb5/mal/Tests/tst1203.stable.out
monetdb5/mal/Tests/tst1205.malC
monetdb5/mal/Tests/tst1205.stable.err
monetdb5/mal/Tests/tst1205.stable.out
monetdb5/mal/Tests/tst1225.malC
monetdb5/mal/Tests/tst1225.stable.err
monetdb5/mal/Tests/tst1225.stable.out
monetdb5/modules/atoms/Tests/time00.malC
monetdb5/modules/atoms/Tests/time00.stable.err
monetdb5/modules/atoms/Tests/time00.stable.out
monetdb5/modules/atoms/mtime_private.h
Modified Files:
CMakeLists.txt
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/odbc/driver/ODBCUtil.c
common/stream/stream.c
configure.ag
embedded/monetdb_embedded.c
gdk/gdk.h
gdk/gdk_analytic_bounds.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_hash.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_system.c
gdk/gdk_utils.c
gdk/gdk_value.c
monetdb5/ChangeLog
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst021.malC
monetdb5/mal/Tests/tst1200.malC
monetdb5/mal/Tests/tst1200.stable.out
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/atoms/mtime_analytic.c
monetdb5/modules/kernel/Tests/time01.malC
monetdb5/modules/kernel/Tests/time01.stable.out
monetdb5/modules/kernel/alarm.mal
monetdb5/modules/kernel/algebra.c
monetdb5/modules/mal/batmtime.mal
monetdb5/modules/mal/batmtime.mal.sh
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/oltp.c
monetdb5/modules/mal/sysmon.c
monetdb5/optimizer/Tests/commonTerms.stable.out
monetdb5/optimizer/Tests/tst4002.malC
monetdb5/optimizer/Tests/tst4002.stable.out
monetdb_config.h.in
sql/ChangeLog.Apr2019
sql/backends/monet5/Tests/pyapi18.stable.out
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_datetrunc.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_generator.c
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/wlr.c
sql/benchmarks/tpch/14.sql
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128
sql/benchmarks/tpch/Tests/0

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-06-07 Thread Pedro Ferreira 
Changeset: 86c5063a7626 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86c5063a7626
Added Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
Modified Files:
CMakeLists.txt
MonetDB.spec
common/utils/matomic.h
debian/rules
gdk/gdk_posix.c
gdk/gdk_system.c
gdk/gdk_system.h
monetdb5/mal/mal.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_namespace.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_scenario.h
monetdb5/mal/mal_stack.h
monetdb5/mal/mal_type.h
monetdb5/optimizer/opt_wlc.c
monetdb_config.h.in
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.sql
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.sql
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out

sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun.


diffs (truncated from 13321 to 300 lines):

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -384,8 +384,6 @@ else()
set(ICONV_LIBRARIES "" CACHE INTERNAL "iconv libraries to link")
 endif()
 
-check_include_file("pthread.h" HAVE_PTHREAD_H) # Distinguish between posix 
thread and win32 thread libraries
-
 # Password hash algorithm
 set(PASSWORD_BACKEND "SHA512" CACHE STRING "Password hash algorithm, one of 
MD5, SHA1, RIPEMD160, SHA224, SHA256, SHA384, SHA512, defaults to SHA512")
 if(${PASSWORD_BACKEND} MATCHES 
"^MD5|SHA1|RIPEMD160|SHA224|SHA256|SHA384|SHA512$")
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -955,7 +955,6 @@ fi
 export CFLAGS
 %{configure} \
--enable-assert=no \
-   --enable-console=yes \
--enable-debug=no \
--enable-developer=no \
--enable-embedded=no \
diff --git a/common/utils/matomic.h b/common/utils/matomic.h
--- a/common/utils/matomic.h
+++ b/common/utils/matomic.h
@@ -277,8 +277,6 @@ typedef volatile char ATOMIC_FLAG;
 
 #else
 
-#include  //required for pthread_mutex_t
-
 /* emulate using mutexes */
 
 #include  /* required for pthread_mutex_t */
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,6 @@ DH_VERBOSE=1
 override_dh_auto_configure:
dh_auto_configure -- \
--enable-assert=no \
-   --enable-console=yes \
--enable-debug=no \
--enable-developer=no \
--enable-embedded=no \
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -19,7 +19,6 @@
 #include "gdk.h"   /* includes gdk_posix.h */
 #include "gdk_private.h"
 #include "mutils.h"
-#include 
 #include 
 #ifdef __MACH__
 # include 
@@ -221,13 +220,11 @@
  * this may be around 2000 BATs easily.
  */
 
-#ifdef HAVE_PTHREAD_H
+#ifndef NATIVE_WIN32
+
 #include 
 #include 
 #include 
-#endif
-
-#ifndef NATIVE_WIN32
 
 void
 MT_init_posix(void)
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -160,7 +160,7 @@ GDKlockstatistics(int what)
 
 #endif /* LOCK_STATS */
 
-#if !defined(HAVE_PTHREAD_H) && defined(WIN32)
+#ifdef WIN32
 static struct winthread {
struct winthread *next;
HANDLE hdl;
@@ -466,7 +466,7 @@ MT_kill_thread(MT_Id t)
return -1;
 }
 
-#else  /* !defined(HAVE_PTHREAD_H) && defined(_MSC_VER) */
+#else
 
 static struct posthread {
struct posthread *next;
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -80,22 +80,16 @@
 #define TEMMASK(1<<10)
 #define TEMDEBUG   if (GDKdebug & TEMMASK)
 
-/*
- * @- pthreads Includes and Definitions
- */
-#ifdef HAVE_PTHREAD_H
-#include 
-#include 
-#include 
-#endif
-
 #ifdef __MACH__ /* dispatch_semaphore_create function */
 #include 
 #endif
 
 #ifndef NATIVE_WIN32
-# include/* prerequisite of sys/sysctl on OpenBSD */
-# include 
+#include 
+#include 
+#include 
+#include /* prerequisite of sys/sysctl on OpenBSD */
+#include 
 #endif
 
 /* debug and errno integers */
@@ -266,7 +260,7 @@ gdk_export int MT_join_thread(MT_Id t);
 
 #ifdef USE_PTHREAD_LOCKS
 
-#if !defined(HAVE_PTHREAD_H) && defined(WIN32)
+#ifdef WIN32
 typedef struct MT_Lock {
HANDLE lock;
char name[16];
@@ -557,7 +551,7 @@ typedef struct MT_RWLock {
 /*
  * @- MT Semaphore API
  */
-#if !defined(HA

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-06-06 Thread Pedro Ferreira 
Changeset: 92c019d0a9aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92c019d0a9aa
Removed Files:

sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.stable.out.int128

sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out.int128
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128

sql/test/BugTracker-2011/Tests/non-stable-select-bug.Bug-2894.stable.out.int128

sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.stable.out.int128

sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128
sql/test/BugTracker-2012/Tests/power_priority.Bug-2291.stable.out.int128

sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.out.int128
sql/test/BugTracker-2013/Tests/case-orderby.Bug-3388.stable.out.int128
sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.out.int128
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.stable.out.int128

sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.out.int128
sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out.int128

sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_select.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_client.h
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_type.c
monetdb5/mal/mal_type.h
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/pcre.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_statement.c
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/rel.txt
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_schema.c
sql/server/rel_semantic.c
sql/server/rel_sequence.c
sql/server/rel_trans.c
sql/server/rel_updates.c
sql/server/sql_scan.c
sql/server/sql_scan.h
sql/server/sql_semantic.c
sql/storage/sql_catalog.c
sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.sql
sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.stable.out
sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.sql
sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.sql
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/non-stable-select-bug.Bug-2894.sql
sql/test/BugTracker-2011/Tests/non-stable-select-bug.Bug-2894.stable.out
sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.sql

sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.stable.out

sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.sql

sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.sql

sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql

sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.out
sql/test/BugTracker-2013/Tests/case-orderby.Bug-3388.sql
sql/test/BugTracker-2013/Tests/case-orderby.Bug-3388.stable.out
sql/test/BugTracker-2013/Tests/hashed_exp.Bug-3313.sql
sql/test/BugTracker-2013/Tests/prepare-smallint.Bug-3297.sql
sql/test/BugTracker-2013/Tests/prepare-smallint.Bug-3297.stable.out

sql/test/BugTracker-2013/Tests/prepare-smallint.Bug-3297.stable.out.int128
sql/test/BugTracker-2014/Tests/groupby.Bug-3421.sql
sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.out
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.sql
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.stable.out
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.sql
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.out
sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-06-05 Thread Pedro Ferreira 
Changeset: 16057af49c2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16057af49c2c
Modified Files:
common/utils/matomic.h
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_select.c
gdk/gdk_system.h
monetdb5/mal/mal_import.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_scenario.c
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.sql
sql/test/Tests/trace.sql
sql/test/Tests/trace.stable.out
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun.


diffs (truncated from 479 to 300 lines):

diff --git a/common/utils/matomic.h b/common/utils/matomic.h
--- a/common/utils/matomic.h
+++ b/common/utils/matomic.h
@@ -281,6 +281,8 @@ typedef volatile char ATOMIC_FLAG;
 
 /* emulate using mutexes */
 
+#include  /* required for pthread_mutex_t */
+
 typedef size_t ATOMIC_BASE_TYPE;
 typedef struct {
ATOMIC_BASE_TYPE val;
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -577,12 +577,13 @@ MT_mremap(const char *path, int mode, vo
 #endif
 #endif
) {
-   int err = errno;
+   int err = errno, other;
/* extending failed:
 * free any disk space
 * allocated in the
 * process */
-   (void) ftruncate(fd, (off_t) 
old_size);
+   other = ftruncate(fd, (off_t) 
old_size);
+   (void) other; /* silence 
compiler warning for ignoring result of ftruncate */
errno = err; /* restore for 
error message */
GDKsyserror("MT_mremap: growing 
file failed\n");
close(fd);
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -259,9 +259,10 @@ BAT *virtualize(BAT *bn)
__attribute__((__visibility__("hidden")));
 
 /* some macros to help print info about BATs when using ALGODEBUG */
-#define ALGOBATFMT "%s#" BUNFMT "[%s]%s%s%s%s%s%s%s%s%s"
+#define ALGOBATFMT "%s#" BUNFMT "@" OIDFMT "[%s]%s%s%s%s%s%s%s%s%s"
 #define ALGOBATPAR(b)  BATgetId(b),\
BATcount(b),\
+   b->hseqbase,\
ATOMname(b->ttype), \
!b->batTransient ? "P" : isVIEW(b) ? "V" : "T", \
BATtdense(b) ? "D" : "",\
@@ -273,11 +274,13 @@ BAT *virtualize(BAT *bn)
b->torderidx ? "O" : "",\
b->timprints ? "I" : b->theap.parentid && 
BBP_cache(b->theap.parentid)->timprints ? "(I)" : ""
 /* use ALGOOPTBAT* when BAT is optional (can be NULL) */
-#define ALGOOPTBATFMT  "%s%s" BUNFMT "%s%s%s%s%s%s%s%s%s%s%s%s"
+#define ALGOOPTBATFMT  "%s%s" BUNFMT "%s" OIDFMT "%s%s%s%s%s%s%s%s%s%s%s%s"
 #define ALGOOPTBATPAR(b)   \
b ? BATgetId(b) : "",   \
b ? "#" : "",   \
b ? BATcount(b) : 0,\
+   b ? "@" : "",   \
+   b ? b->hseqbase : 0,\
b ? "[" : "",   \
b ? ATOMname(b->ttype) : "",\
b ? "]" : "",   \
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1216,6 +1216,7 @@ BATselect(BAT *b, BAT *s, const void *tl
BAT *bn, *tmp;
BUN estimate = BUN_NONE, maximum = BUN_NONE;
oid vwl = 0, vwh = 0;
+   lng vwo = 0;
bool use_orderidx = false;
union {
bte v_bte;
@@ -1250,11 +1251,14 @@ BATselect(BAT *b, BAT *s, const void *tl
(s->tseqbase >= b->hseqbase + BATcount(b) ||
 s->tseqbase + BATcount(s) <= b->hseqbase) {
/* trivially empty result */
+   bn = BATdense(0, 0, 0);
ALGODEBUG MT_fprintf(stderr, "#BATselect(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=%d): "
+ ",s=" ALGOOPTBATFMT ",anti=%d)=" ALGOOPTBATFMT
+ " (" LLFMT " usec): "
  "trivially empty\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(s), anti);
-   return BATdense(0, 0, 0);
+ ALGOBATPAR(b), A

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-06-04 Thread Pedro Ferreira 
Changeset: f34a34a91fb3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f34a34a91fb3
Modified Files:
CMakeLists.txt

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/extras/rapi/rapi.c
monetdb5/mal/Tests/tst670.stable.err
sql/backends/monet5/sql.h
sql/backends/monet5/sql_assert.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_optimizer.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_transaction.h
sql/common/sql_types.h
sql/server/rel_exp.h
sql/server/rel_select.c
sql/server/sql_env.h
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_privileges.h
sql/server/sql_tokens.h

sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql

sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.out
sql/test/Tests/trace.stable.out
tools/CMakeLists.txt
tools/mserver/CMakeLists.txt
tools/mserver/mserver5.1.in
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun.


diffs (truncated from 1170 to 300 lines):

diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -71,7 +71,7 @@ stdout of test 'opt_sql_append` in direc
 % mal # name
 % clob # type
 % 183 # length
-function user.s10_1():void;
+function user.s10_0():void;
 X_1:void := querylog.define("explain copy into ttt from 
E\\'a:tmp/xyz\\';":str, "sequential_pipe":str, 22:int);
 X_4:int := sql.mvc();
 (X_26:bat[:int], X_27:bat[:int], X_28:bat[:int]) := sql.copy_from(nil:ptr, 
"|":str, "\n":str, nil:str, "null":str, "a:\\tmp/xyz":str, -1:lng, 0:lng, 
0:int, 0:int, nil:str, 0:int);
@@ -114,7 +114,7 @@ end user.s10_0;
 % L2 # name
 % varchar # type
 % 6 # length
-[ "user_1"  ]
+[ "user_0"  ]
 #select def from optimizers() where name = optimizer;
 % .L1 # table_name
 % def # name
@@ -126,8 +126,8 @@ end user.s10_0;
 % mal # name
 % clob # type
 % 182 # length
-function user.s26_1():void;
-X_1:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';":str, "user_1":str, 22:int);
+function user.s26_0():void;
+X_1:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';":str, "user_0":str, 22:int);
 X_4:int := sql.mvc();
 (X_26:bat[:int], X_27:bat[:int], X_28:bat[:int]) := sql.copy_from(nil:ptr, 
"|":str, "\n":str, nil:str, "null":str, "Z:/tmp/xyz":str, -1:lng, 0:lng, 0:int, 
0:int, nil:str, 0:int);
 X_30:int := sql.append(X_4:int, "sys":str, "ttt":str, "a":str, 
X_26:bat[:int]);
@@ -135,7 +135,7 @@ function user.s26_1():void;
 X_40:lng := aggr.count(X_28:bat[:int]);
 X_38:int := sql.append(X_35:int, "sys":str, "ttt":str, "c":str, 
X_28:bat[:int]);
 sql.affectedRows(X_38:int, X_40:lng);
-end user.s26_1;
+end user.s26_0;
 #inline   actions= 0 time=0 usec 
 #remapactions= 0 time=2 usec 
 #costmodelactions= 1 time=1 usec 
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -43,7 +43,7 @@
 #endif
 
 CREATE_SQL_FUNCTION_PTR(str, SQLstatementIntern);
-CREATE_SQL_FUNCTION_PTR(void, res_table_destroy);
+CREATE_SQL_FUNCTION_PTR(void, SQLdestroyResult);
 
 /* we need the BAT-SEXP-BAT conversion in two places, here and in 
tools/embedded */
 #include "converters.c.h"
@@ -208,7 +208,7 @@ static char *RAPIinitialize(void) {
if (e)
return e;
 
-   LOAD_SQL_FUNCTION_PTR(res_table_destroy);
+   LOAD_SQL_FUNCTION_PTR(SQLdestroyResult);
if (e)
return e;
 
@@ -512,12 +512,12 @@ void* RAPIloopback(void *query) {
SET_STRING_ELT(names, i, 
RSTR(output->cols[i].name));
SET_VECTOR_ELT(retlist, i, varvalue);
}
-   (*res_table_destroy_ptr)(output);
+   (*SQLdestroyResult_ptr)(output);
SET_NAMES(retlist, names);
UNPROTECT(ncols + 2);
return retlist;
}
-   (*res_table_destroy_ptr)(output);
+   (*SQLdestroyResult_ptr)(output);
}
return ScalarLogical(1);
 }
diff --git a/monetdb5/mal/Tests/tst670.stable.err 
b/monetdb5/mal/Tests/tst670.stable.err
--- a/monetdb5/mal/Tests/tst670.stable.err
+++ b/monetdb5/mal/Tests/tst670.stable.err
@@ -10,18 +10,6 @@ stderr of test 'tst670` in directory 'mo
 # 09:29:49 >  "mclient" "-lmal" "-ftest"

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-05-31 Thread Pedro Ferreira 
Changeset: a826dc3956b3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a826dc3956b3
Added Files:
sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.sql

sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.err

sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.out
Removed Files:
sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128

sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out.int128
sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.stable.out.int128

sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128

sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.stable.out.int128
sql/test/BugTracker-2009/Tests/avg-bug.SF-2132666.stable.out.int128

sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out.int128
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out.int128
sql/test/Tests/outerref_in_selection.sql.src
Modified Files:
buildtools/scripts/mal2h.py
buildtools/scripts/sql2h.py
embedded/monetdb_embedded.c
monetdb5/mal/mal.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_private.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/server/rel_psm.c
sql/server/rel_select.c
sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.sql
sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out
sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql
sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.sql

sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.sql

sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out
sql/test/BugTracker-2009/Tests/avg-bug.SF-2132666.sql
sql/test/BugTracker-2009/Tests/avg-bug.SF-2132666.stable.out
sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out.int128

sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.sql

sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.sql
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out
sql/test/BugTracker-2017/Tests/prepare.Bug-6133.stable.err
sql/test/BugTracker-2019/Tests/All
sql/test/Tests/outerref_in_selection.stable.out
sql/test/merge-partitions/Tests/mergepart28.stable.err
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun.


diffs (truncated from 1613 to 300 lines):

diff --git a/buildtools/scripts/mal2h.py b/buildtools/scripts/mal2h.py
--- a/buildtools/scripts/mal2h.py
+++ b/buildtools/scripts/mal2h.py
@@ -33,7 +33,7 @@ insert1 = ''.join([
 '*/\n',
 '\n',
 '// This file was generated automatically with mal2h.py. Do not edit this 
file directly.\n',
-'char ', output_file_split[0], '[] = {'])
+'static char ', output_file_split[0], '[] = {'])
 mal_h_output_file.write(insert1)
 
 file_stat = os.stat(sys.argv[1])
diff --git a/buildtools/scripts/sql2h.py b/buildtools/scripts/sql2h.py
--- a/buildtools/scripts/sql2h.py
+++ b/buildtools/scripts/sql2h.py
@@ -33,7 +33,7 @@ insert1 = ''.join([
 '*/\n',
 '\n',
 '// This file was generated automatically with sql2h.py. Do not edit this 
file directly.\n',
-'char ', output_file_split[0], '[] = {'])
+'static char ', output_file_split[0], '[] = {'])
 sql_h_output_file.write(insert1)
 
 file_stat = os.stat(sys.argv[1])
diff --git a/embedded/monetdb_embedded.c b/embedded/monetdb_embedded.c
--- a/embedded/monetdb_embedded.c
+++ b/embedded/monetdb_embedded.c
@@ -393,15 +393,8 @@ monetdb_append(monetdb_connection conn, 
if (m->session->status < 0 && m->session->auto_commit == 0)
return createException(MAL, "embedded.monetdb_append", 
SQLSTATE(25005) "Current transaction is aborted (please ROLLBACK)");
 
-   SQLtrans(m);
-   if (*m->errstr) {
-   if (strlen(m->errstr) > 6 && m->errstr[5] == '!')
-   msg = createException(MAL, "embedded.monetdb_append", 
"%s", m->errstr);
-   else
-   msg = createException(MAL, "embedded.monetdb_append", 
SQLSTATE(42000) "%s", m->errstr);
-   *m->errstr=0;
+   if ((msg = SQLtrans(m)) != MAL_SUCCEED)
return msg;
-   }
if (!m->sa) { // unclear why this is required
m->sa = sa_create();
if (!m->sa)
diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/ma

MonetDB: cmake-monetdblite - Merge with cmake-fun.

2019-05-28 Thread Pedro Ferreira 
Changeset: 6637cbe81e6c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6637cbe81e6c
Modified Files:
CMakeLists.txt
cmake/Distribute.cmake
cmake/FindLiblas.cmake
common/utils/FindRevision.cmake
monetdb5/extras/rapi/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
testing/CMakeLists.txt
Branch: cmake-monetdblite
Log Message:

Merge with cmake-fun.


diffs (151 lines):

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,9 +113,15 @@ set(OPTIONS_LIST CINTEGRATION EMBEDDED F
 foreach(EXTENSION IN LISTS OPTIONS_LIST)
if(ENABLE_${EXTENSION})
string(TOUPPER "${ENABLE_${EXTENSION}}" ENABLE_${EXTENSION})
+   if(NOT "${EXTENSION}" STREQUAL "REGEX" AND NOT 
"${ENABLE_${EXTENSION}}" MATCHES "^YES|NO|AUTO$")
+   message(FATAL_ERROR "ENABLE_${EXTENSION} value must be 
either YES, NO or AUTO")
+   endif()
endif()
if(WITH_${EXTENSION})
string(TOUPPER "${WITH_${EXTENSION}}" WITH_${EXTENSION})
+   if(NOT "${WITH_${EXTENSION}}" MATCHES "^YES|NO|AUTO$")
+   message(FATAL_ERROR "WITH_${EXTENSION} value must be 
either YES, NO or AUTO")
+   endif()
endif()
 endforeach()
 
@@ -320,8 +326,10 @@ if(Python3_Interpreter_FOUND)
if("${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" VERSION_LESS 
${PYTHON3_REQUIRED_VERSION})
message(WARNING "The Python 3 executable is too old 
${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR} < 
${PYTHON3_REQUIRED_VERSION}")
else()
-   exec_program("${Python3_EXECUTABLE}" ARGS "-c \"import 
distutils.sysconfig; 
print(distutils.sysconfig.get_python_lib(1,0,'${CMAKE_INSTALL_PREFIX}'))\"" 
OUTPUT_VARIABLE PYTHON3_LIBDIR RETURN_VALUE PYTHON3_LIBDIR_CODE)
-   if(PYTHON3_LIBDIR AND PYTHON3_LIBDIR_CODE EQUAL 0)
+   execute_process(COMMAND "${Python3_EXECUTABLE}" "-c"
+   "import distutils.sysconfig; 
print(distutils.sysconfig.get_python_lib(1,0,'${CMAKE_INSTALL_PREFIX}'))"
+   RESULT_VARIABLE PY3_LIBDIR_CODE 
OUTPUT_VARIABLE PYTHON3_LIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+   if(PYTHON3_LIBDIR AND PY3_LIBDIR_CODE EQUAL 0)
set(HAVE_PYTHON3 ON CACHE INTERNAL "python3 is 
available")
else()
message(WARNING "Could not determine MonetDB Python 
testing files instalation directory")
diff --git a/cmake/Distribute.cmake b/cmake/Distribute.cmake
--- a/cmake/Distribute.cmake
+++ b/cmake/Distribute.cmake
@@ -37,7 +37,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
 
find_program(ECHO NAMES echo DOC "echo program fullpath")
if(NOT ECHO OR NOT BASH)
-   message(FATAL_ERROR "echo and bash program are required to 
build rpms")
+   message(FATAL_ERROR "echo and bash programs are required to 
build rpms")
endif()
 
# Create a temporary file in CMakeFiles and copy it to the final 
location while setting proper permissions
@@ -47,7 +47,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
 FILE_PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT})
file(REMOVE ${CMAKE_BINARY_DIR}/CMakeFiles/find_linux_distro.sh)
 
-   exec_program("${CMAKE_BINARY_DIR}/find_linux_distro.sh" OUTPUT_VARIABLE 
LINUX_DIST RETURN_VALUE LINUX_DIST_RC)
+   execute_process(COMMAND "${CMAKE_BINARY_DIR}/find_linux_distro.sh" 
RESULT_VARIABLE LINUX_DIST_RC
+   OUTPUT_VARIABLE LINUX_DIST 
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(LINUX_DIST AND LINUX_DIST_RC EQUAL 0)
configure_file(${CMAKE_SOURCE_DIR}/rpm.mk.in 
${CMAKE_BINARY_DIR}/rpm.mk @ONLY)
install(FILES ${CMAKE_BINARY_DIR}/rpm.mk DESTINATION 
${INCLUDEDIR}/monetdb)
diff --git a/cmake/FindLiblas.cmake b/cmake/FindLiblas.cmake
--- a/cmake/FindLiblas.cmake
+++ b/cmake/FindLiblas.cmake
@@ -12,7 +12,8 @@ find_path(LIBLAS_INCLUDE_DIR NAMES libla
 # Look for the library.
 find_program(LIBLAS_CONFIG "liblas-config")
 if(LIBLAS_CONFIG)
-   exec_program("${LIBLAS_CONFIG}" ARGS "--libs" OUTPUT_VARIABLE 
LIBLAS_LIBRARIES RETURN_VALUE LIBLAS_LIBDIR_CODE)
+   execute_process(COMMAND "${LIBLAS_CONFIG}" "--libs" RESULT_VARIABLE 
LIBLAS_LIBDIR_CODE
+   OUTPUT_VARIABLE LIBLAS_LIBRARIES 
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT LIBLAS_LIBDIR_CODE EQUAL 0)
unset(LIBLAS_LIBRARIES)
endif()
diff --git a/common/utils/FindRevision.cmake b/common/utils/FindRevision.cmake
--- a/common/utils/FindRevision.cmake
+++ b/common/utils/FindRevision.cmake
@@ -12,14 +12,16 @@ endif()
 
 # Get the current version control revision
 if(EXISTS "${CMAKE_ARGV4}/.hg")
-