Changeset: eecd12cb4552 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eecd12cb4552
Added Files:
sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.sql
sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.stable.err
sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.stable.out
sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.sql
sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.stable.err
sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.stable.out
sql/test/BugTracker-2018/Tests/ordered-index-error.Bug-6572.sql
sql/test/BugTracker-2018/Tests/ordered-index-error.Bug-6572.stable.err
sql/test/BugTracker-2018/Tests/ordered-index-error.Bug-6572.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
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-complex-case-nullif-coalesce.Bug-6565.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6568.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6568.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6568.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6573.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6573.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6573.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in-cast.Bug-6561.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in-cast.Bug-6561.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in-cast.Bug-6561.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-not-null-not-in.Bug-6562.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-not-null-not-in.Bug-6562.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-not-null-not-in.Bug-6562.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-missing-bulk-implementation.Bug-6575.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-missing-bulk-implementation.Bug-6575.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-missing-bulk-implementation.Bug-6575.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-undefined-calc.Bug-6570.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-undefined-calc.Bug-6570.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-undefined-calc.Bug-6570.stable.out
sql/test/BugTracker-2018/Tests/truncate_tmp_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_tmp_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_tmp_tables.Bug-6543.stable.err
sql/test/BugTracker-2018/Tests/truncate_tmp_tables.Bug-6543.stable.out
Removed Files:
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
testing/MkillUsers.in
testing/Mtimeout.c
Modified Files:
.hgtags
MonetDB.spec
NT/mkodbcwxs.py
NT/mksqlwxs.py
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog.Mar2018
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
buildtools/doc/windowsbuild.rst
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/examples/C/Makefile.ag
clients/mapiclient/Makefile.ag
clients/mapiclient/Tests/mclient--help
clients/mapiclient/Tests/mclient--help.bat
clients/mapiclient/Tests/msqldump--help
clients/mapiclient/Tests/msqldump--help.bat
clients/mapiclient/Tests/stethoscope--help
clients/mapiclient/Tests/stethoscope--help.bat
clients/mapiclient/Tests/tachograph--help
clients/mapiclient/Tests/tachograph--help.bat
clients/mapiclient/Tests/tomograph--help
clients/mapiclient/Tests/tomograph--help.bat
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/mapilib/Makefile.ag
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/Makefile.ag
common/stream/monetdb-stream.pc.in
common/utils/mcrypt.h
common/utils/muuid.h
configure.ag
debian/changelog
debian/monetdb-testing.install
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_cand.h
gdk/gdk_cross.c
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_join.c
gdk/gdk_select.c
gdk/libbat.rc
gdk/monetdb-gdk.pc.in
geom/monetdb5/Makefile.ag
libversions
monetdb5/extras/mal_optimizer_template/Makefile.ag
monetdb5/extras/rapi/Makefile.ag
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/Tests/select.malC
monetdb5/modules/kernel/Tests/select.stable.out
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/remote.h
monetdb5/modules/mal/remote.mal
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/tools/Makefile.ag
monetdb5/tools/Tests/mserver5--help
monetdb5/tools/Tests/mserver5--help.bat
monetdb5/tools/libmonetdb5.rc
monetdb5/tools/monetdb5.pc.in
sql/ChangeLog-Archive
sql/ChangeLog.Mar2018
sql/backends/monet5/LSST/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/Tests/Mbeddedsql5--help
sql/backends/monet5/Tests/Mbeddedsql5--help.bat
sql/backends/monet5/UDF/capi/Makefile.ag
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi3/Makefile.ag
sql/backends/monet5/UDF/udf/Makefile.ag
sql/backends/monet5/generator/Makefile.ag
sql/backends/monet5/generator/Tests/generator00.stable.out
sql/backends/monet5/generator/Tests/generator03.stable.out
sql/backends/monet5/generator/Tests/joins01.stable.out
sql/backends/monet5/generator/generator.c
sql/backends/monet5/generator/generator.mal
sql/backends/monet5/generator/generator_hge.mal
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/vaults/Makefile.ag
sql/backends/monet5/vaults/bam/Makefile.ag
sql/backends/monet5/vaults/bam/Tests/mergetable.stable.out
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/Makefile.ag
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/shp/Makefile.ag
sql/include/sql_mem.h
sql/rel.txt
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_privileges.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/not_null.SF-933194.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/type_dump_test.SF-989257.SQL.sh
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.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-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2015/Tests/null.Bug-3833.stable.out
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/null_in_null.Bug-3900.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/cleanup_statistics.Bug-6439.stable.out
sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD
sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.err
sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err
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/sqlitelogictest-case-coalesce.Bug-6550.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-coalesce.Bug-6550.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.out
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.out
sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.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-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out
sql/test/Skyserver/Tests/Skyserver.stable.out
sql/test/Tests/bogus-auto-generated-keys.SQL.sh
sql/test/Tests/comment-on.sql
sql/test/Tests/comment-on.stable.err
sql/test/Tests/comment-on.stable.out
sql/test/VOC/Tests/VOC.stable.out
sql/test/bugs/Tests/create_insert_select_aggr-bug-00001.stable.out
sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.SQL.sh
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.SQL.sh
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
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/mergetables/Tests/mergequery.stable.out
sql/test/mergetables/Tests/part-elim.stable.out
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/random.stable.out
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/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/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
testing/ChangeLog
testing/Makefile.ag
testing/Mtest.py.in
testing/README
testing/listexports.py.in
testing/process.py
tools/merovingian/ChangeLog
tools/merovingian/client/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/properties.c
tools/mserver/Makefile.ag
vertoo.data
Branch: merge-partitions
Log Message:
Merge with default
diffs (truncated from 135025 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -692,3 +692,6 @@ 4fd4a5c7b66747468a2b41930d1b987a4b0efff4
a294cafd5cac3397e148032bee9d8efc89f5c82a Mar2018_root
28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_1
28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_release
+f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_3
+28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_release
+f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -854,9 +854,7 @@ developer. If you do want to test, inst
%license COPYING
%defattr(-,root,root)
%{_bindir}/Mdiff
-%{_bindir}/MkillUsers
%{_bindir}/Mlog
-%{_bindir}/Mtimeout
%package testing-python
Summary: MonetDB - Monet Database Management System
@@ -1046,6 +1044,21 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Tue Mar 27 2018 Sjoerd Mullender <sjo...@acm.org> - 11.29.3-20180327
+- Rebuilt.
+- BZ#3824: Created table not visible from ODBC
+- BZ#6556: Sqlitelogictest division by zero on COALESCE call
+- BZ#6557: Sqlitelogictest crash on aggregation query with not in
+- BZ#6559: rows in sys.statistics are not removed when a temporary table
+ is dropped.
+- BZ#6560: Sqlitelogictest crash on group by query with having in
+- BZ#6561: Sqlitelogictest crash on group by query with having not
+ in clause
+
+* Thu Mar 15 2018 Sjoerd Mullender <sjo...@acm.org> - 11.29.3-20180327
+- sql: Extended support to use CREATE ORDERED INDEX on columns of type: char,
+ varchar, clob, blob, url, json, inet and uuid.
+
* Thu Mar 15 2018 Sjoerd Mullender <sjo...@acm.org> - 11.29.1-20180315
- Rebuilt.
- BZ#3574: Add support for: create OR REPLACE view ...
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -34,9 +34,11 @@ def main():
if makedefs['bits'] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
+ libcrypto = '-x64'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ libcrypto = ''
vs = os.getenv('vs') # inherited from TestTools\common.bat
features = []
print(r'<?xml version="1.0"?>')
@@ -73,10 +75,9 @@ def main():
r'lib\libMonetODBC.dll', r'lib\libMonetODBC.pdb',
r'lib\libMonetODBCs.dll', r'lib\libMonetODBCs.pdb',
r'lib\libstream.dll', r'lib\libstream.pdb',
- r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
+ r'%s\bin\iconv-2.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
- r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'],
- r'%s\bin\ssleay32.dll' % makedefs['LIBOPENSSL'],
+ r'%s\bin\libcrypto-1_1%s.dll' % (makedefs['LIBOPENSSL'],
libcrypto),
r'%s\bin\zlib1.dll' % makedefs['LIBZLIB']])
print(r' </Directory>')
id = comp(features, id, 12,
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -34,9 +34,11 @@ def main():
if makedefs['bits'] == '64':
folder = r'ProgramFiles64Folder'
arch = 'x64'
+ libcrypto = '-x64'
else:
folder = r'ProgramFilesFolder'
arch = 'x86'
+ libcrypto = ''
vs = os.getenv('vs') # inherited from TestTools\common.bat
features = []
print(r'<?xml version="1.0"?>')
@@ -84,12 +86,11 @@ def main():
r'lib\libmapi.dll', r'lib\libmapi.pdb',
r'lib\libmonetdb5.dll', r'lib\libmonetdb5.pdb',
r'lib\libstream.dll', r'lib\libstream.pdb',
- r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
+ r'%s\bin\iconv-2.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
- r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'],
+ r'%s\bin\libcrypto-1_1%s.dll' % (makedefs['LIBOPENSSL'],
libcrypto),
r'%s\bin\libxml2.dll' % makedefs['LIBXML2'],
r'%s\bin\pcre.dll' % makedefs['LIBPCRE'],
- r'%s\bin\ssleay32.dll' % makedefs['LIBOPENSSL'],
r'%s\bin\zlib1.dll' % makedefs['LIBZLIB']])
print(r' </Directory>')
print(r' <Directory Id="etc" Name="etc">')
@@ -125,12 +126,11 @@ def main():
r'lib\libmapi.lib',
r'lib\libmonetdb5.lib',
r'lib\libstream.lib',
- r'%s\lib\iconv.lib' % makedefs['LIBICONV'],
+ r'%s\lib\iconv.dll.lib' % makedefs['LIBICONV'],
r'%s\lib\libbz2.lib' % makedefs['LIBBZIP2'],
- r'%s\lib\libeay32.lib' % makedefs['LIBOPENSSL'],
+ r'%s\lib\libcrypto.lib' % makedefs['LIBOPENSSL'],
r'%s\lib\libxml2.lib' % makedefs['LIBXML2'],
r'%s\lib\pcre.lib' % makedefs['LIBPCRE'],
- r'%s\lib\ssleay32.lib' % makedefs['LIBOPENSSL'],
r'%s\lib\zdll.lib' % makedefs['LIBZLIB']])
print(r' </Directory>')
print(r' <Directory Id="share" Name="share">')
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -600,7 +600,7 @@
#endif
/* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST /* const */
/* Define as SQLLEN * or SQLPOINTER depending on the include file */
#ifdef _WIN64
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -39,12 +39,6 @@ BITSMCHN=X64
!ENDIF
!IFDEF DEBUG
-DEBUGLIB=d
-!ELSE
-DEBUGLIB=
-!ENDIF
-
-!IFDEF DEBUG
# force W_CFLAGS off in debug builds: using icc, you get way more
# warnings about casts which results in the code being uncompilable
W_CFLAGS =
@@ -98,16 +92,16 @@ PYTHON_LIBDIR=$(PYTHON3_LIBDIR)
!IFNDEF LIBPCRE
LIBPCRE = C:\Program Files\PCRE
!ENDIF
-pcre_LIBS = "$(LIBPCRE)\lib\pcre$(DEBUGLIB).lib"
+pcre_LIBS = "$(LIBPCRE)\lib\pcre.lib"
pcre_CFLAGS = -DHAVE_LIBPCRE "-I$(LIBPCRE)\include"
!ENDIF
!IFDEF HAVE_OPENSSL
# This is the location of the OpenSSL library
!IFNDEF LIBOPENSSL
-LIBOPENSSL = C:\openssl-0.9.8k.win$(bits)
+LIBOPENSSL = C:\openssl-1.1.0g.win$(bits)
!ENDIF
-openssl_LIBS = "$(LIBOPENSSL)\lib\ssleay32.lib"
"$(LIBOPENSSL)\lib\libeay32.lib"
+openssl_LIBS = "$(LIBOPENSSL)\lib\libcrypto.lib"
openssl_CFLAGS = -DHAVE_OPENSSL "-I$(LIBOPENSSL)\include"
!ENDIF
@@ -116,7 +110,7 @@ openssl_CFLAGS = -DHAVE_OPENSSL "-I$(LIB
!IFNDEF LIBICONV
LIBICONV = C:\iconv-1.9.2.win$(bits)
!ENDIF
-LTLIBICONV = "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
+LTLIBICONV = "$(LIBICONV)\lib\iconv.dll.lib"
ICONV_CFLAGS = -DHAVE_ICONV "-I$(LIBICONV)\include"
!ENDIF
@@ -135,7 +129,7 @@ LIBZLIB = C:\zlib-1.2.3.win$(bits)
!IFNDEF LIBZLIBFILE
LIBZLIBFILE=zlib1
!ENDIF
-zlib_LIBS = "$(LIBZLIB)\lib\$(LIBZLIBFILE)$(DEBUGLIB).lib"
+zlib_LIBS = "$(LIBZLIB)\lib\$(LIBZLIBFILE).lib"
zlib_CFLAGS = -DHAVE_LIBZ "-I$(LIBZLIB)\include"
!ENDIF
@@ -144,7 +138,7 @@ zlib_CFLAGS = -DHAVE_LIBZ "-I$(LIBZLIB)\
!IFNDEF LIBBZIP2
LIBBZIP2 = C:\bzip2-1.0.5.win$(bits)
!ENDIF
-BZ_LIBS = "$(LIBBZIP2)\lib\libbz2$(DEBUGLIB).lib"
+BZ_LIBS = "$(LIBBZIP2)\lib\libbz2.lib"
BZ_CFLAGS = -DHAVE_LIBBZ2 "-I$(LIBBZIP2)\include"
!ENDIF
@@ -154,17 +148,13 @@ BZ_CFLAGS = -DHAVE_LIBBZ2 "-I$(LIBBZIP2)
LIBXML2 = C:\libxml2-2.6.30.win$(bits)
!ENDIF
libxml2_CFLAGS = -DHAVE_LIBXML "-I$(LIBXML2)\include" $(zlib_CFLAGS)
$(ICONV_CFLAGS)
-libxml2_LIBS = "$(LIBXML2)\lib\libxml2$(DEBUGLIB).lib" $(zlib_LIBS)
$(ICONV_LIBS)
+libxml2_LIBS = "$(LIBXML2)\lib\libxml2.lib" $(zlib_LIBS) $(ICONV_LIBS)
!ENDIF
!IFNDEF LIBGEOS
LIBGEOS = C:\geos-3.0.win$(bits)
!ENDIF
-!IFDEF DEBUG
-GEOS_LIBS = $(LIBGEOS)\lib\geos_c_i$(GEOSDEBUGLIB).lib
-!ELSE
GEOS_LIBS = $(LIBGEOS)\lib\geos_c_i.lib
-!ENDIF
GEOS_INCS = -I$(LIBGEOS)\include
!IFDEF HAVE_LIBR
diff --git a/buildtools/ChangeLog.Mar2018 b/buildtools/ChangeLog.Mar2018
--- a/buildtools/ChangeLog.Mar2018
+++ b/buildtools/ChangeLog.Mar2018
@@ -1,3 +1,11 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Apr 3 2018 Sjoerd Mullender <sjo...@acm.org>
+- On Linux and Unix, try not to link to libraries multiple times: that
+ only causes the code (and worse, the variables in those libraries) to be
+ included multiple times. On Windows, we do need to link to libraries
+ multiple times (once for each DLL we create if the DLL references
+ anything from the library) but that doesn't cause the linked library
+ to be loaded multiple times.
+
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -208,12 +208,19 @@ def am_additional_libs(name, sep, type,
if l[0] not in ("-", "$", "@"):
l = am_translate_dir(l, am) + ".la"
if c:
- if c in ('NATIVE_WIN32', 'WIN32'):
+ c = c.split('&')
+ if 'NATIVE_WIN32' in c:
continue
global libno
v = 'LIB%d' % libno
libno = libno + 1
- add = 'if %s\n%s = %s\nelse\n%s =\nendif\n%s' % (c, v, l, v, add)
+ s = ''
+ for x in c:
+ s += 'if %s\n' % x
+ s += '%s = %s\n' % (v, l)
+ for x in c:
+ s += 'else\n%s =\nendif\n' % v
+ add = s + add
l = '$(%s)' % v
add = add + " " + l
return add + "\n"
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -209,8 +209,15 @@ def msc_additional_libs(fd, name, sep, t
for l in list:
if '?' in l:
c, l = l.split('?', 1)
- if c in ('NATIVE_WIN32', 'WIN32'):
- c = None
+ c = c.split('&')
+ try:
+ c.remove('NATIVE_WIN32')
+ except ValueError:
+ pass
+ try:
+ c.remove('WIN32')
+ except ValueError:
+ pass
else:
c = None
d = None
@@ -243,7 +250,7 @@ def msc_additional_libs(fd, name, sep, t
global libno
v = 'LIB%d' % libno
libno = libno + 1
- cond += '!IF defined(%s)\n%s = %s\n!ELSE\n%s =\n!ENDIF\n' % (c, v,
l, v)
+ cond += '!IF defined(%s)\n%s = %s\n!ELSE\n%s =\n!ENDIF\n' % (') &&
defined('.join(c), v, l, v)
l = '$(%s)' % v
if d:
deps = '%s %s' % (deps, l)
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -18,7 +18,7 @@ architecture, but there are notes throug
on a 64-bit architecture which is indicated with Windows64. We have
successfully built on Windows XP, Windows Server, and Windows 7.
-.. _MonetDB: http://dev.monetdb.org/hg/MonetDB/
+.. _MonetDB: https://dev.monetdb.org/hg/MonetDB/
__ MonetDB_
@@ -132,7 +132,7 @@ using the command
::
- hg clone http://dev.monetdb.org/hg/MonetDB/
+ hg clone https://dev.monetdb.org/hg/MonetDB/
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
