Changeset: e0cea0103b8b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0cea0103b8b Added Files: monetdb5/mal/Tests/tst1602.timeout monetdb5/modules/mal/Tests/bigsum.timeout monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_candidates.h sql/backends/monet5/Tests/rapi16.stable.err sql/backends/monet5/Tests/rapi16.stable.out sql/backends/monet5/Tests/rapi17.sql sql/backends/monet5/Tests/rapi18.sql sql/benchmarks/wisconsin/Tests/load.timeout sql/test/BugTracker-2012/Tests/huge_insert.Bug-2803.stable.err sql/test/BugTracker-2012/Tests/huge_insert.Bug-2803.stable.out sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.stable.err sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.stable.out sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.timeout sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.sql sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.err sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out.int128 sql/test/BugTracker-2015/Tests/batting.csv.gz sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.sql.in sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.err sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.out sql/test/BugTracker-2015/Tests/large_join.Bug-3809.sql sql/test/BugTracker-2015/Tests/large_join.Bug-3809.stable.err sql/test/BugTracker-2015/Tests/large_join.Bug-3809.stable.out sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.sql sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.err sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.out sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out sql/test/BugTracker-2015/Tests/select-tilde-arg.Bug-3814.sql sql/test/BugTracker-2015/Tests/select-tilde-arg.Bug-3814.stable.err sql/test/BugTracker-2015/Tests/select-tilde-arg.Bug-3814.stable.out sql/test/Tests/alastair_udf_mergetable_bug.stable.out.int128 sql/test/Users/Tests/copyinto.SQL.py sql/test/mergetables/Tests/singlekeyconstraint.stable.err sql/test/mergetables/Tests/singlekeyconstraint.stable.out sql/test/pg_regress/Tests/float8.stable.err.int128 Removed Files: gdk/gdk_join_legacy.c gdk/gdk_mapreduce.c gdk/gdk_mapreduce.h gdk/gdk_select_legacy.c gdk/gdk_setop.c monetdb5/modules/mal/Tests/ascii_io2.load monetdb5/modules/mal/cluster.c monetdb5/modules/mal/cluster.h monetdb5/modules/mal/cluster.mal monetdb5/optimizer/Tests/tst4610.mal monetdb5/optimizer/Tests/tst4610.stable.err monetdb5/optimizer/Tests/tst4610.stable.out monetdb5/optimizer/opt_accumulators.c monetdb5/optimizer/opt_accumulators.h sql/storage/restrict/restrict_logger.c sql/storage/restrict/restrict_logger.h sql/storage/restrict/restrict_storage.c sql/storage/restrict/restrict_storage.h sql/storage/restrict/restrict_table.c sql/storage/restrict/restrict_table.h sql/test/BugTracker-2015/Tests/schemadiff.SQL.py Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj buildtools/doc/windowsbuild.rst clients/R/MonetDB.R/R/mapi.R clients/R/Tests/deps-test.stable.out clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/odbc/driver/ODBCConvert.c clients/php/examples/query.php clients/php/lib/php_monetdb.php clients/ruby/lib/MonetDB.rb clients/ruby/lib/MonetDBConnection.rb clients/ruby/lib/MonetDBData.rb configure.ag gdk/ChangeLog gdk/Makefile.ag gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_delta.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_sample.c gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_ssort.c gdk/gdk_ssort_impl.h gdk/gdk_storage.c gdk/gdk_tm.c gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h monetdb5/ChangeLog monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/extras/pyapi/Tests/pyapi_returntypes.stable.err monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/extras/sphinx/sphinx.c monetdb5/mal/Tests/tst007.mal monetdb5/mal/Tests/tst007.stable.out monetdb5/mal/Tests/tst077.mal monetdb5/mal/Tests/tst077.stable.out monetdb5/mal/Tests/tst104.mal monetdb5/mal/Tests/tst104.stable.out monetdb5/mal/Tests/tst105.mal monetdb5/mal/Tests/tst105.stable.out monetdb5/mal/Tests/tst105a.mal monetdb5/mal/Tests/tst105a.stable.out monetdb5/mal/Tests/tst106.mal monetdb5/mal/Tests/tst106.stable.out monetdb5/mal/Tests/tst150.mal monetdb5/mal/Tests/tst150.stable.out monetdb5/mal/Tests/tst201.mal monetdb5/mal/Tests/tst201.stable.out monetdb5/mal/Tests/tst220.mal monetdb5/mal/Tests/tst220.stable.out monetdb5/mal/Tests/tst233.mal monetdb5/mal/Tests/tst233.stable.out monetdb5/mal/Tests/tst234.mal monetdb5/mal/Tests/tst234.stable.out monetdb5/mal/Tests/tst285.mal monetdb5/mal/Tests/tst285.stable.out monetdb5/mal/Tests/tst750.mal monetdb5/mal/Tests/tst750.stable.out monetdb5/mal/Tests/tst755.mal monetdb5/mal/Tests/tst755.stable.out monetdb5/mal/Tests/tst760.mal monetdb5/mal/Tests/tst760.stable.out monetdb5/mal/Tests/tst770.mal monetdb5/mal/Tests/tst770.stable.out monetdb5/mal/Tests/tst802.mal monetdb5/mal/Tests/tst802.stable.out monetdb5/mal/Tests/tst810.mal monetdb5/mal/Tests/tst810.stable.out monetdb5/mal/Tests/tst908.mal monetdb5/mal/Tests/tst908.stable.out monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_linker.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_type.c monetdb5/mal/mal_type.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/uuid.mal monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/bat5.mal monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batstr.c monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/Tests/All monetdb5/modules/mal/Tests/ascii_io2.mal monetdb5/modules/mal/Tests/ascii_io2.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.int128 monetdb5/modules/mal/Tests/mapi07.stable.out monetdb5/modules/mal/Tests/remote12.mal monetdb5/modules/mal/Tests/remote12.stable.out monetdb5/modules/mal/Tests/remoteInit.mal monetdb5/modules/mal/Tests/remoteInit.stable.out monetdb5/modules/mal/Tests/tokenizer00.stable.out monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/bbp.h monetdb5/modules/mal/bbp.mal monetdb5/modules/mal/calc.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_io.h monetdb5/modules/mal/mal_io.mal monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mal_mapi.mal monetdb5/modules/mal/manifold.c monetdb5/modules/mal/manifold.h monetdb5/modules/mal/mat.c monetdb5/modules/mal/mat.h monetdb5/modules/mal/mat.mal monetdb5/modules/mal/mkey.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/remote.mal monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/transaction.c monetdb5/modules/mal/transaction.mal monetdb5/modules/mal/zorder.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/remap.mal monetdb5/optimizer/Tests/remap.stable.out monetdb5/optimizer/Tests/tst4630.mal monetdb5/optimizer/Tests/tst4630.stable.out monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_joinpath.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal monetdb5/tests/BugReports/Tests/gettype_in_function.mal monetdb5/tests/BugReports/Tests/gettype_in_function.stable.out monetdb5/tests/BugReports/Tests/no.163.mal monetdb5/tests/BugReports/Tests/no.163.stable.out sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/All sql/backends/monet5/Tests/optimizers.sql sql/backends/monet5/Tests/optimizers.stable.err sql/backends/monet5/Tests/rapi16.sql sql/backends/monet5/UDF/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/Tests/udf-reverse.stable.out sql/backends/monet5/UDF/udf.c sql/backends/monet5/embeddedclient.c.in sql/backends/monet5/embeddedclient.h sql/backends/monet5/gsl/gsl.c sql/backends/monet5/prog.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_bat2time.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cast_impl_down_from_flt.h sql/backends/monet5/sql_cast_impl_down_from_int.h sql/backends/monet5/sql_cast_impl_up_to_flt.h sql/backends/monet5/sql_cast_impl_up_to_int.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/fits.c sql/backends/monet5/vaults/netcdf.c sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/include/sql_catalog.h sql/scripts/25_debug.sql sql/server/rel_optimizer.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_datetime.c sql/server/sql_parser.y sql/server/sql_privileges.c sql/server/sql_privileges.h sql/storage/bat/bat_utils.c sql/storage/bat/bat_utils.h sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out sql/test/BugTracker-2011/Tests/All 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-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out sql/test/BugTracker-2012/Tests/All sql/test/BugTracker-2012/Tests/huge_insert.Bug-2803.sql sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.sql sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single sql/test/BugTracker-2014/Tests/All sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.err sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.err sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.out sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.err sql/test/BugTracker-2015/Tests/sessions_crash.Bug-3759.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Tests/All sql/test/Tests/alastair_udf_mergetable_bug.py sql/test/Tests/alastair_udf_mergetable_bug.stable.out sql/test/Tests/setoptimizer.stable.err sql/test/Tests/setoptimizer.stable.out sql/test/Tests/setoptimizer.stable.out.Windows sql/test/Tests/str-pad.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Users/Tests/All sql/test/leaks/Tests/check0.sql sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/mergetables/Tests/All sql/test/mergetables/Tests/mergequery.stable.out sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/float8.stable.out.Windows sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/loadwisconsin.timeout sql/test/pg_regress/Tests/oid.stable.err.oid32 sql/test/remote/Tests/All sql/test/remote/Tests/partition_elim.stable.out sql/test/setoptimizer.sql testing/Mtest.py.in testing/process.py Branch: pyapi Log Message:
Merge with default. diffs (truncated from 88911 to 300 lines): diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj b/NT/installer32/MonetDB-ODBC-Installer.vdproj --- a/NT/installer32/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj @@ -330,7 +330,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win32\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -370,7 +370,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win32\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -675,12 +675,6 @@ } "Entry" { - "MsmKey" = "8:_B262C796F62A48F596C8828B2470C0D6" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_B2CE130DAD3B4D3FA2F1CE0B77BE0F21" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1582,7 +1576,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win32\\lib\\libeay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\lib\\libeay32.lib" "TargetName" = "8:libeay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1902,7 +1896,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win32\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -2322,7 +2316,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win32\\lib\\ssleay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\lib\\ssleay32.lib" "TargetName" = "8:ssleay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -3200,26 +3194,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B262C796F62A48F596C8828B2470C0D6" - { - "SourcePath" = "8:lib\\monetdb5\\cluster.mal" - "TargetName" = "8:cluster.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B2CE130DAD3B4D3FA2F1CE0B77BE0F21" { "SourcePath" = "8:lib\\monetdb5\\createdb\\11_times.sql" @@ -3802,7 +3776,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win32\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj b/NT/installer64/MonetDB-ODBC-Installer.vdproj --- a/NT/installer64/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj @@ -330,7 +330,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win64\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win64\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -370,7 +370,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win64\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win64\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -63,12 +63,6 @@ } "Entry" { - "MsmKey" = "8:_09037EED43A6416AA200DF27BB53F675" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0C663F8F9CD74DE2A56C520C4E893AA2" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1180,26 +1174,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_09037EED43A6416AA200DF27BB53F675" - { - "SourcePath" = "8:lib\\monetdb5\\cluster.mal" - "TargetName" = "8:cluster.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0C663F8F9CD74DE2A56C520C4E893AA2" { "SourcePath" = "8:lib\\monetdb5\\querylog.mal" @@ -1642,7 +1616,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win64\\lib\\libeay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win64\\lib\\libeay32.lib" "TargetName" = "8:libeay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1862,7 +1836,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win64\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win64\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -2402,7 +2376,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win64\\lib\\ssleay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win64\\lib\\ssleay32.lib" "TargetName" = "8:ssleay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -3942,7 +3916,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2a.win64\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win64\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst +++ b/buildtools/doc/windowsbuild.rst @@ -313,17 +313,17 @@ required for the MonetDB5 component, and the clients component when it needs to talk to a MonetDB5 server. Download the source from http://www.openssl.org/. We used the latest -stable version (1.0.2c). Follow the instructions in the file +stable version (1.0.2d). Follow the instructions in the file ``INSTALL.W32`` or ``INSTALL.W64``. We used the option ``enable-static-engine`` as described in the instructions. .. The actual commands used were:: - perl Configure VC-WIN32 no-asm enable-static-engine --prefix=C:\Libraries\openssl-1.0.2c.win32 + perl Configure VC-WIN32 no-asm enable-static-engine --prefix=C:\Libraries\openssl-1.0.2d.win32 ms\do_ms.bat nmake /f ms\ntdll.mak nmake /f ms\ntdll.mak install and:: - perl Configure VC-WIN64A enable-static-engine --prefix=C:\Libraries\openssl-1.0.2c.win64 + perl Configure VC-WIN64A enable-static-engine --prefix=C:\Libraries\openssl-1.0.2d.win64 ms\do_win64a.bat nmake /f ms\ntdll.mak nmake /f ms\ntdll.mak install @@ -658,7 +658,7 @@ command for ``lib`` in ``makefile.msc``. After this, compile using ``nmake /f makefile.msc`` and copy the files ``bzlib.h``, ``libbz2.dll``, and ``libbz2.lib`` to a location where the MonetDB build process can find them, -e.g. ``C:\Libraries\bzip2-1.0.5.win32``. +e.g. ``C:\Libraries\bzip2-1.0.6.win32``. .. Before copying the files, run the command:: mt /nologo /manifest libbz2.dll.manifest /Outputresource:libbz2.dll;2 diff --git a/clients/R/MonetDB.R/R/mapi.R b/clients/R/MonetDB.R/R/mapi.R --- a/clients/R/MonetDB.R/R/mapi.R +++ b/clients/R/MonetDB.R/R/mapi.R @@ -118,7 +118,7 @@ REPLY_SIZE <- 100 # Apparently, -1 me resp <- c(resp, readChar(con, length, useBytes = TRUE)) if (final == 1) break } - if (getOption("monetdb.debug.mapi", F)) cat(paste("RX: '", substring(paste0(resp, collapse=""), 1, 200), "'\n", sep="")) + if (getOption("monetdb.debug.mapi", F)) message("RX: '", substring(paste0(resp, collapse=""), 1, 200)) return(paste0("", resp, collapse="")) } @@ -128,7 +128,7 @@ REPLY_SIZE <- 100 # Apparently, -1 me stop("I can only be called with a MonetDB connection object as parameter.") final <- FALSE pos <- 0 - if (getOption("monetdb.debug.mapi", F)) message("TX: '", msg, "'\n", sep="") + if (getOption("monetdb.debug.mapi", F)) message("TX: '", msg) # convert to raw byte array, otherwise multibyte characters are 'difficult' msgr <- charToRaw(msg) msglen <- length(msgr) diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -2328,11 +2328,7 @@ command algebra.join(left:bat[:oid,:any_ address ALGjoin2; comment Returns 2 columns with all BUNs, consisting of the head-oids from 'left' and 'right' for which there are BUNs in 'left' and 'right' with equal tails -pattern algebra.leftfetchjoinPath(l:bat[:any,:any]...):bat[:any,:any] -address ALGjoinPath; -comment Routine to handle join paths. The type analysis is rather tricky. - -pattern algebra.leftjoinPath(l:bat[:any,:any]...):bat[:oid,:any] +pattern algebra.leftfetchjoinPath(l:bat[:oid,:any]...):bat[:oid,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. @@ -2354,18 +2350,10 @@ command algebra.like(s:str,pat:str):bit address PCRElike2; command algebra.like(s:str,pat:str,esc:str):bit address PCRElike3; -command algebra.like(b:bat[:oid,:str],substr:str):bat[:oid,:str] -address ALGlike; -comment Selects all elements that have 'substr' as in the tail. - command algebra.leftfetchjoin(left:bat[:oid,:oid],right:bat[:oid,:any_3]):bat[:oid,:any_3] address ALGleftfetchjoin; comment Hook directly into the left fetch join implementation. -command algebra.leftjoin(left:bat[:oid,:any_2],right:bat[:any_2,:any_3],estimate:lng):bat[:oid,:any_3] -address ALGleftjoinestimate; -command algebra.leftjoin(left:bat[:oid,:any_2],right:bat[:any_2,:any_3]):bat[:oid,:any_3] -address ALGleftjoin; command algebra.not_ilike(s:str,pat:str):bit address PCREnotilike2; command algebra.not_ilike(s:str,pat:str,esc:str):bit @@ -2382,7 +2370,7 @@ command algebra.reuse(b:bat[:oid,:any_1] address ALGreuse; comment Reuse a temporary BAT if you can. Otherwise, allocate enough storage to accept result of an operation (not involving the heap) -pattern algebra.semijoinPath(l:bat[:any,:any]...):bat[:any,:any] +pattern algebra.semijoinPath(l:bat[:oid,:any]...):bat[:oid,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. @@ -2487,10 +2475,6 @@ command algebra.subsort(b:bat[:oid,:any_ address ALGsubsort11; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list