Changeset: c4458894d297 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4458894d297
Added Files:
ChangeLog.Mar2018
buildtools/ChangeLog.Mar2018
clients/ChangeLog.Mar2018
clients/mapilib/ChangeLog.Mar2018
common/stream/ChangeLog.Mar2018
gdk/ChangeLog.Mar2018
geom/ChangeLog.Mar2018
monetdb5/ChangeLog.Mar2018
sql/ChangeLog.Mar2018
sql/scripts/21_dependency_views.sql
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.sql
sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.sql
sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.err
sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.out
sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.sql
sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.stable.err
sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.sql
sql/test/FeatureRequests/Tests/All
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-epilogue.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-epilogue.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-epilogue.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-epilogue.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.reqtests
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.sql
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.err
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.stable.out
sql/test/Tests/create-or-replace-triggers.sql
sql/test/Tests/create-or-replace-triggers.stable.err
sql/test/Tests/create-or-replace-triggers.stable.out
sql/test/Tests/create-or-replace-views.sql
sql/test/Tests/create-or-replace-views.stable.err
sql/test/Tests/create-or-replace-views.stable.out
sql/test/Tests/drop-function-if-exists.sql
sql/test/Tests/drop-function-if-exists.stable.err
sql/test/Tests/drop-function-if-exists.stable.out
sql/test/Tests/drop-trigger-if-exists.sql
sql/test/Tests/drop-trigger-if-exists.stable.err
sql/test/Tests/drop-trigger-if-exists.stable.out
sql/test/Tests/truncate-statements-extra.sql
sql/test/Tests/truncate-statements-extra.stable.err
sql/test/Tests/truncate-statements-extra.stable.out
sql/test/Tests/truncate-statements.sql
sql/test/Tests/truncate-statements.stable.err
sql/test/Tests/truncate-statements.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
testing/ChangeLog.Mar2018
tools/merovingian/ChangeLog.Mar2018
Removed Files:
sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb/Tests/testdb-dump.stable.out.Windows
Modified Files:
.hgtags
MonetDB.spec
NT/mkgeomwxs.py
NT/mkodbcwxs.py
NT/mksqlwxs.py
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2017
buildtools/autogen/autogen/msc.py
clients/ChangeLog
clients/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/mapiclient/mhelp.c
clients/mapiclient/mnc.c
clients/mapiclient/msqldump.h
clients/mapilib/ChangeLog
clients/mapilib/mapi.c
clients/mapilib/mapi.rc
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCDesc.c
clients/odbc/driver/ODBCGlobal.h
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/SQLBindParameter.c
clients/odbc/driver/SQLColumns.c
clients/odbc/driver/SQLDescribeCol.c
clients/odbc/driver/SQLDescribeParam.c
clients/odbc/driver/SQLExecute.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLGetTypeInfo.c
clients/odbc/driver/SQLSpecialColumns.c
clients/odbc/driver/SQLTables.c
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/ChangeLog
common/stream/stream.c
configure.ag
debian/changelog
gdk/ChangeLog
gdk/gdk_aggr.c
gdk/gdk_atoms.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_orderidx.c
gdk/gdk_private.h
gdk/gdk_project.c
gdk/libbat.rc
geom/monetdb5/geom_upgrade.c
libversions
monetdb5/ChangeLog
monetdb5/extras/rapi/converters.c.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/modules/atoms/json.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/profiler.mal
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/wlc.c
monetdb5/modules/mal/wlc.mal
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_postfix.c
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/backends/monet5/UDF/capi/cheader.h
sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal
sql/backends/monet5/UDF/pyapi3/Makefile.ag
sql/backends/monet5/UDF/pyapi3/connection3.c
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/backends/monet5/UDF/pyapi3/emit3.c
sql/backends/monet5/UDF/pyapi3/formatinput3.c
sql/backends/monet5/UDF/pyapi3/pyapi3.c
sql/backends/monet5/UDF/pyapi3/pyapi3.mal
sql/backends/monet5/UDF/pyapi3/pyloader3.c
sql/backends/monet5/UDF/pyapi3/pytypes3.c
sql/backends/monet5/UDF/pyapi3/type_conversion3.c
sql/backends/monet5/UDF/pyapi3/unicode3.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
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_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sqlcatalog.mal
sql/backends/monet5/wlr.c
sql/backends/monet5/wlr.mal
sql/common/sql_string.c
sql/common/sql_string.h
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/scripts/21_dependency_functions.sql
sql/scripts/46_profiler.sql
sql/scripts/51_sys_schema_extension.sql
sql/scripts/Makefile.ag
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_partition.c
sql/server/rel_psm.c
sql/server/rel_psm.h
sql/server/rel_rel.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/rel_updates.c
sql/server/rel_updates.h
sql/server/sql_atom.c
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/server/sql_scan.c
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql
sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out.int128
sql/test/DropCascade/Tests/drop_columns_cascade.stable.out
sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out
sql/test/Tests/All
sql/test/Tests/comment-dump.stable.out
sql/test/Tests/comment-on.stable.out
sql/test/Tests/keys.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.SQL.py
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/create_view.stable.err
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/float8.stable.err.int128
sql/test/pg_regress/Tests/insert.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.err
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.err
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb/Tests/testdb-dump.stable.out
sql/test/testdb/Tests/testdb-load.sql
testing/ChangeLog
testing/Mtest.py.in
tools/merovingian/ChangeLog
tools/merovingian/daemon/client.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/proxy.c
tools/merovingian/utils/control.c
tools/merovingian/utils/properties.c
tools/mserver/shutdowntest.c
vertoo.data
Branch: trails
Log Message:
Merge with default
diffs (truncated from 409329 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -687,3 +687,6 @@ fce449d5af88de715fde36624815a56ef34c56bb
3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_SP2_release
b9276cb02ced7d98bcb27b5e6df600b2791f1fcd Jul2017_11
b9276cb02ced7d98bcb27b5e6df600b2791f1fcd Jul2017_SP3_release
+4fd4a5c7b66747468a2b41930d1b987a4b0efff4 Jul2017_13
+4fd4a5c7b66747468a2b41930d1b987a4b0efff4 Jul2017_SP4_release
+a294cafd5cac3397e148032bee9d8efc89f5c82a Mar2018_root
diff --git a/ChangeLog b/ChangeLog.Mar2018
copy from ChangeLog
copy to ChangeLog.Mar2018
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.28.0
+%define version 11.30.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jul2017-SP3/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2017-SP4/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1046,6 +1046,54 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Fri Feb 02 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- Rebuilt.
+- BZ#3470: Support setClob without length restrictions
+- BZ#6468: JDBC 2.27 fails with year < 1000
+- BZ#6482: Query failures on order by on union
+- BZ#6483: Monetdb crashes, on query
+- BZ#6487: UNION of NULLs with several tables fails
+- BZ#6488: Semijoin returns duplicate values from a column with unique
+ values
+- BZ#6489: Sqlitelogictest - Wrong result set of complex conditional query
+- BZ#6490: Sqlitelogictest - Select query with an IN clause parse error
+- BZ#6491: SELECT IN returns NULL instead of false when not found
+- BZ#6492: Persistent hashes stored and then ignored. Storage info not
+ in sync with actual indices.
+- BZ#6493: Sqlitelogictest - Aggregation query on empty table with
+ DISTINCT clause
+- BZ#6494: Sqlitelogictest - Algebra operators priority in select query
+- BZ#6495: Sqlitelogictest - Omitting AS in a result set column alias name
+- BZ#6496: Sqlitelogictest - Select interval comparisons between
+ floating-points and NULL
+- BZ#6497: Sqlitelogictest - Select not between query producing wrong
+ results
+- BZ#6498: large virtual memory spike on BLOB column COUNT
+- BZ#6499: Crash when trying to replace a function defined in sys from
+ a different schema
+- BZ#6502: Query with multiple limit clauses does not return anything
+- BZ#6508: Segmentation fault in mserver5 on Python2 UDF with TIMESTAMP
+ column input that has NULL values (conversion.c:438, PyNullMask_FromBAT)
+- BZ#6510: Sqlitelogictest: Wrong output in aggregation query
+- BZ#6512: Monetdb crashes on query with limit after sort with case
+- BZ#6514: Sqlitelogictest: Range query between NULL values not possible
+- BZ#6515: Insert null second interval value results in 0
+- BZ#6516: Sqlitelogictest unknown bat append operation
+- BZ#6517: Sqlitelogictest overflow in conversion during MAL plan
+ execution
+- BZ#6518: Sqlitelogictest: count aggregation with not in operator
+- BZ#6519: Sqlitelogictest: algebra join between lng and int BATs
+ undefined
+- BZ#6520: UPDATE with correlated subquery causes assertion (or segfault)
+- BZ#6522: Sqlitelogictest: IN operator return a single column
+- BZ#6523: Sqlitelogictest: Case statement subquery missing
+- BZ#6524: Sqlitelogictest: Crash in aggregation query with IN operator
+- BZ#6527: Crash using order by alias in subquery
+
+* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- buildtools: Added the .lib and .h files needed for building extensions to the
+ Windows installer.
+
* Mon Dec 04 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.11-20171204
- Rebuilt.
- BZ#3898: Deadlock on insertion
diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py
--- a/NT/mkgeomwxs.py
+++ b/NT/mkgeomwxs.py
@@ -83,7 +83,7 @@ def main():
id = comp(features, id, 16,
[r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
id = comp(features, id, 16,
- [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.dll') and ('geom' in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
print(r' </Directory>')
print(r' </Directory>')
print(r' </Directory>')
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -67,10 +67,10 @@ def main():
id = 1
print(r' <Directory Id="lib" Name="lib">')
id = comp(features, id, 14,
- [r'lib\libmapi.dll',
- r'lib\libMonetODBC.dll',
- r'lib\libMonetODBCs.dll',
- r'lib\libstream.dll',
+ [r'lib\libmapi.dll', r'lib\libmapi.pdb',
+ r'lib\libMonetODBC.dll', r'lib\libMonetODBC.pdb',
+ r'lib\libMonetODBCs.dll', r'lib\libMonetODBCs.pdb',
+ r'lib\libstream.dll', r'lib\libstream.pdb',
r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'],
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -74,14 +74,14 @@ def main():
id = 1
print(r' <Directory Id="bin" Name="bin">')
id = comp(features, id, 14,
- [r'bin\mclient.exe',
- r'bin\mserver5.exe',
- r'bin\msqldump.exe',
- r'bin\stethoscope.exe',
- r'lib\libbat.dll',
- r'lib\libmapi.dll',
- r'lib\libmonetdb5.dll',
- r'lib\libstream.dll',
+ [r'bin\mclient.exe', r'bin\mclient.pdb',
+ r'bin\mserver5.exe', r'bin\mserver5.pdb',
+ r'bin\msqldump.exe', r'bin\msqldump.pdb',
+ r'bin\stethoscope.exe', r'bin\stethoscope.pdb',
+ r'lib\libbat.dll', r'lib\libbat.pdb',
+ r'lib\libmapi.dll', r'lib\libmapi.pdb',
+ r'lib\libmonetdb5.dll', r'lib\libmonetdb5.pdb',
+ r'lib\libstream.dll', r'lib\libstream.pdb',
r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'],
@@ -116,7 +116,7 @@ def main():
id = comp(features, id, 16,
[r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.endswith('.mal') and ('geom' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
id = comp(features, id, 16,
- [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
print(r' </Directory>')
id = comp(features, id, 14,
[r'lib\libbat.lib',
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
@@ -666,7 +666,7 @@
#define PACKAGE_URL "https://www.monetdb.org/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.28.0"
+#define PACKAGE_VERSION "11.30.0"
/* Path separator */
#define PATH_SEP ';'
@@ -892,10 +892,6 @@ c99_snprintf(char *outBuf, size_t size,
#define ssize_t int
#endif
-/* normally defined in fcntl.h, but not on Windows */
-#define O_CLOEXEC 0
-
-
typedef int64_t lng;
typedef uint64_t ulng;
#define SIZEOF_LNG 8
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-VERSION=11.28.0
+VERSION=11.30.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- Added the .lib and .h files needed for building extensions to the
+ Windows installer.
+
* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
- The Debian and Ubuntu installers have been fixed: there was a file
missing in the Jul2017 release.
diff --git a/buildtools/ChangeLog.Jul2017 b/buildtools/ChangeLog.Jul2017
--- a/buildtools/ChangeLog.Jul2017
+++ b/buildtools/ChangeLog.Jul2017
@@ -1,7 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org>
-- Added the .lib and .h files needed for building extensions to the
- Windows installer.
-
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Mar2018
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Mar2018
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
@@ -693,6 +693,7 @@ def msc_library(fd, var, libmap, msc):
sep = ""
pref = 'lib'
dll = '.dll'
+ pdb = '.pdb'
if "NAME" in libmap:
libname = libmap['NAME'][0]
else:
@@ -823,9 +824,6 @@ def msc_library(fd, var, libmap, msc):
fd.write("%s%s: $(%s_DEPS) \n" % (ln, dll, ln.replace('-','_')))
fd.write('\tpython "$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS)
-LD -Fe%s%s @<< /link @<<\n$(%s_OBJS)\n<<\n$(%s_LIBS)%s\n<<\n' % (ln, dll,
ln.replace('-','_'), ln.replace('-','_'), deffile))
fd.write("\tif exist $@.manifest $(MT) -manifest $@.manifest
-outputresource:$@;2\n");
- if sep == '_':
- fd.write('\tif not exist .libs $(MKDIR) .libs\n')
- fd.write('\t$(INSTALL) "%s%s" ".libs\\%s%s"\n' % (ln, dll, ln,
dll))
fd.write("\n")
if SCRIPTS:
@@ -1039,6 +1037,7 @@ def output(tree, cwd, topdir):
fd.write('install_bin_%s: %s\n' % (dst, src))
fd.write('\tif not exist "$(%sdir)" $(MKDIR) "$(%sdir)"\n' %
(dst.replace('-','_'), dst.replace('-','_')))
fd.write('\t$(INSTALL) %s "$(%sdir)"\n' %
(src,dst.replace('-','_')))
+ fd.write('\t$(INSTALL) %s.pdb "$(%sdir)"\n' %
(dst,dst.replace('-','_')))
if cond:
fd.write('!ELSE\n')
fd.write('install_bin_%s:\n' % dst)
@@ -1053,6 +1052,8 @@ def output(tree, cwd, topdir):
fd.write('\t$(INSTALL) "%s" "%s\\%s%s"\n' % (src, dir, dst, ext))
if instlib:
fd.write('\t$(INSTALL) "%s" "%s\\%s%s"\n' % (instlib, dir,
dst, '.lib'))
+ if src.endswith('.dll'):
+ fd.write('\t$(INSTALL) "%s" "%s\\%s%s"\n' %
(src.replace('.dll', '.pdb'), dir, dst, '.pdb'))
if cond:
fd.write('!ELSE\n')
fd.write('install_%s:\n' % dst)
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,17 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Thu Nov 16 2017 Sjoerd Mullender <sjo...@acm.org>
-- The functions in the mapi library that require 64 bit integers now
- use the standard type int64_t instead of the non-standard mapi_int64.
- This requires a compilation environment that has the stdint.h include
- file (standardized in C99). Compilation of the library also requires
- the inttypes.h include file (also standardized in C99).
-
-* Mon Jul 17 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com>
-- Add a new pretty printing option to stethoscope
- Running stethoscope with the flag -j will produce not pretty printed
- output (one json object per line). Running with the -y flag will produce
- pretty printed output. Running with neither, wiil produce the legacy,
- line oriented format
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Mar2018
copy from clients/ChangeLog
copy to clients/ChangeLog.Mar2018
--- a/clients/ChangeLog
+++ b/clients/ChangeLog.Mar2018
@@ -1,6 +1,18 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Thu Feb 1 2018 Sjoerd Mullender <sjo...@acm.org>
+- ODBC: Changed table types as used by SQLTables from "LOCAL TEMPORARY"
+ and "GLOBAL TEMPORARY" to "LOCAL TEMPORARY TABLE" and "GLOBAL TEMPORARY
+ TABLE" respectively.
+
+* Wed Jan 31 2018 Sjoerd Mullender <sjo...@acm.org>
+- ODBC: Initial support for the HUGEINT type in SQL was added. Any value
+ with type HUGEINT can be retrieved in a C variable with type SQL_C_CHAR
+ or SQL_C_WCHAR. A value of type HUGEINT can be retrieved in other C
+ types as long as they fit, the largest C type supported being a 64 bit
+ integer (equivalent to BIGINT).
+
* Thu Nov 16 2017 Sjoerd Mullender <sjo...@acm.org>
- The functions in the mapi library that require 64 bit integers now
use the standard type int64_t instead of the non-standard mapi_int64.
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
