Changeset: 7526b95c0b41 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7526b95c0b41 Added Files: sql/backends/monet5/Tests/rapi17.stable.err sql/backends/monet5/Tests/rapi17.stable.out sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.sql sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.stable.err sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.stable.out sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part2.reqtests sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part2.sql sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part2.stable.err sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part2.stable.out sql/test/BugTracker-2015/Tests/case_type.Bug-3821.sql sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.err sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.out sql/test/BugTracker-2015/Tests/coalesce.Bug-3830.sql sql/test/BugTracker-2015/Tests/coalesce.Bug-3830.stable.err sql/test/BugTracker-2015/Tests/coalesce.Bug-3830.stable.out sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.sql sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.err sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128 sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.sql sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.sql sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.err sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.out sql/test/BugTracker-2015/Tests/fractional_precision_limitation.Bug-3808.sql sql/test/BugTracker-2015/Tests/fractional_precision_limitation.Bug-3808.stable.err sql/test/BugTracker-2015/Tests/fractional_precision_limitation.Bug-3808.stable.out sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py sql/test/BugTracker-2015/Tests/select-push-crash.Bug-3829.sql sql/test/BugTracker-2015/Tests/select-push-crash.Bug-3829.stable.err sql/test/BugTracker-2015/Tests/select-push-crash.Bug-3829.stable.out sql/test/BugTracker-2015/Tests/timestamp_convert.Bug-3815.sql sql/test/BugTracker-2015/Tests/timestamp_convert.Bug-3815.stable.err sql/test/BugTracker-2015/Tests/timestamp_convert.Bug-3815.stable.out sql/test/BugTracker-2015/Tests/uuid-compare.Bug-3827.sql sql/test/BugTracker-2015/Tests/uuid-compare.Bug-3827.stable.err sql/test/BugTracker-2015/Tests/uuid-compare.Bug-3827.stable.out sql/test/Users/Tests/schemaRights.SQL.py sql/test/Users/Tests/schemaRights.stable.err sql/test/Users/Tests/schemaRights.stable.out testing/Mfilter.py Removed Files: gdk/gdk_mapreduce.c gdk/gdk_mapreduce.h sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.sql testing/Mfilter.py.in Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc buildtools/autogen/autogen/msc.py clients/ChangeLog-Archive clients/ChangeLog.Jul2015 clients/R/Tests/testrandom.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.sql clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/php/examples/query.php clients/php/lib/php_monetdb.php clients/python2/setup.py clients/python3/setup.py clients/ruby/lib/MonetDB.rb clients/ruby/lib/MonetDBConnection.rb clients/ruby/lib/MonetDBData.rb configure.ag debian/changelog debian/monetdb-testing-python.install gdk/Makefile.ag gdk/gdk_bat.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_private.h gdk/gdk_utils.c gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java libversions monetdb5/extras/rapi/rapi.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.mal monetdb5/modules/atoms/uuid.mal monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/aggr.c monetdb5/modules/mal/pcre.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/Tests/All sql/backends/monet5/Tests/rapi14.sql sql/backends/monet5/Tests/rapi14.stable.err sql/backends/monet5/Tests/rapi14.stable.out sql/backends/monet5/UDF/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/Tests/udf-reverse.stable.out sql/backends/monet5/bam/bam_export.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_scenario.h sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out 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/03-explain.stable.out 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/08-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out 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/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/17-explain.stable.out sql/benchmarks/tpch/Tests/17-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/22-explain.stable.out.32bit sql/common/sql_types.c sql/common/sql_types.h sql/server/rel_dump.c sql/server/rel_dump.h sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_sequence.c sql/server/sql_privileges.c sql/server/sql_privileges.h sql/server/sql_semantic.c sql/server/sql_semantic.h sql/storage/store.c sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128 sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.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-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out 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.single sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out.int128 sql/test/BugTracker-2015/Tests/backslash_predecing_separator.Bug-3775.stable.err sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128 sql/test/BugTracker-2015/Tests/large_join.Bug-3809.sql sql/test/BugTracker-2015/Tests/large_join.Bug-3809.stable.out sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.err sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.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/Users/Tests/All sql/test/Users/Tests/columnRights.stable.err sql/test/Users/Tests/columnRights.stable.out sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out sql/test/Users/Tests/grantMonetdb.SQL.py sql/test/Users/Tests/grantMonetdbToRegularUser.Bug-3771.SQL.py sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.SQL.py sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.err sql/test/Users/Tests/grantPrivilegesNonDefaultRole.Bug-3365.stable.err sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.err sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 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 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/mapi/Tests/sql_int128.stable.out sql/test/pg_regress/Tests/int2.stable.out sql/test/pg_regress/Tests/int8.stable.out sql/test/pg_regress/Tests/int8.stable.out.int128 sql/test/pg_regress/Tests/numeric.sql sql/test/pg_regress/Tests/numeric.stable.out sql/test/pg_regress/Tests/select_views.stable.out sql/test/pg_regress/Tests/strings.stable.err.int128 sql/test/pg_regress/Tests/strings.stable.out sql/test/remote/Tests/partition_elim.stable.out sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/dump.SQL.py sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows sql/test/testdb-upgrade-hge/Tests/dump.SQL.py sql/test/testdb-upgrade-hge/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/dump.SQL.py sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out.Windows sql/test/testdb/Tests/testdb-dump.SQL.py sql/test/testdb/Tests/testdb-dump.stable.out sql/test/testdb/Tests/testdb-dump.stable.out.Windows sql/test/testdb/Tests/testdb-load.sql testing/Makefile.ag testing/Mtest.py.in tools/mserver/mserver5.c vertoo.data Branch: profiler Log Message:
Approve outputs diffs (truncated from 34133 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -605,3 +605,5 @@ 30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d c7c0a76e663e34bcddae683b385c8e5a919ffd84 Jul2015_5 30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_release c7c0a76e663e34bcddae683b385c8e5a919ffd84 Jul2015_release +d1bce2fabbc36a3a3b996b09e55e764a626026a8 Jul2015_7 +d1bce2fabbc36a3a3b996b09e55e764a626026a8 Jul2015_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jul2015/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -920,7 +920,6 @@ developer, but if you do want to test, t # %exclude %{_bindir}/*.pyc # %exclude %{_bindir}/*.pyo %{_bindir}/Mapprove.py -%{_bindir}/Mfilter.py %{_bindir}/Mtest.py %dir %{python_sitelib}/MonetDBtesting %{python_sitelib}/MonetDBtesting/* @@ -996,6 +995,42 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Tue Oct 20 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.7-20151020 +- Rebuilt. +- BZ#3789: Query on large string table fails on HEAPextend +- BZ#3794: table function sys.rejects() and view sys.rejects() are listed + are metadata objects but give an (incorrect) error when they are queried +- BZ#3797: COPY INTO with incorrect number columns +- BZ#3798: SELECT query with INTERSECT causes assertion failure +- BZ#3800: LIKE is broken for many patterns +- BZ#3802: Disk space never freed: a logical ref is keeped on a deleted + BATs +- BZ#3803: SQL query parser fails to parse valid SELECT query with a + CASE .. END in it. It fails with parser error: identifier 'x' ambiguous +- BZ#3804: `monetdb status` command crashes under certain conditions +- BZ#3809: Inefficient plan is generated for queries with many (>= 24) + joined tables which take a long time or an HEAPalloc error. I get Error: + GDK reported error. HEAPalloc: Insufficient space for HEAP of 400000000 + bytes. +- BZ#3810: Fix statistics gathering +- BZ#3811: NOT LIKE not working if the operand doesn't contains wildcards. +- BZ#3813: COPY INTO fails on perfectly clean CSV file +- BZ#3814: Server crash when using bitwise NOT operation in SQL query +- BZ#3818: Crash when performing UNION/GROUP BY over tables with + different columns +- BZ#3819: order of tables in FROM-clause has negative impact on generated + plan (using crossproducts instead of joins) +- BZ#3820: mclient accepts table with repeated constraint which causes + crash on insert +- BZ#3821: Unexpected error when using a number instead of a boolean +- BZ#3822: Yet another LIKE operator issue +- BZ#3825: MonetDB not cleaning intermediate results which leads to + filling up disk space and ultimately server crash + +* Sun Aug 30 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.7-20151020 +- clients: In the SQL formatter of mclient (the default) we now properly align + East Asian wide characters. + * Mon Aug 24 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.5-20150824 - Rebuilt. - BZ#3730: SAMPLE function not sampling randomly 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 @@ -230,7 +230,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5" { - "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll" + "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32-vs2010\\bin\\iconv.dll" "TargetName" = "8:iconv.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -250,7 +250,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A" { - "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll" + "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.6.win32-vs2010\\bin\\libbz2.dll" "TargetName" = "8:libbz2.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -290,7 +290,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D" { - "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32\\bin\\zlib1.dll" + "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32-vs2010\\bin\\zlib1.dll" "TargetName" = "8:zlib1.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -330,7 +330,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32-vs2010\\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.2d.win32\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32-vs2010\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj b/NT/installer32/MonetDB5-Geom-Module.vdproj --- a/NT/installer32/MonetDB5-Geom-Module.vdproj +++ b/NT/installer32/MonetDB5-Geom-Module.vdproj @@ -226,7 +226,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268" { - "SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win32\\bin\\geos_c.dll" + "SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win32-vs2010\\bin\\geos_c.dll" "TargetName" = "8:geos_c.dll" "Tag" = "8:" "Folder" = "8:_5A4CF78A6BC241B6AAEFF30075ECAE13" 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 @@ -1016,7 +1016,7 @@ { "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4" { - "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32\\lib\\zdll.lib" + "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32-vs2010\\lib\\zdll.lib" "TargetName" = "8:zdll.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1136,7 +1136,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3" { - "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll" + "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.6.win32-vs2010\\bin\\libbz2.dll" "TargetName" = "8:libbz2.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -1196,7 +1196,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F" { - "SourcePath" = "8:C:\\Libraries\\libxml2-2.9.2.win32\\bin\\libxml2.dll" + "SourcePath" = "8:C:\\Libraries\\libxml2-2.9.2.win32-vs2010\\bin\\libxml2.dll" "TargetName" = "8:libxml2.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -1256,7 +1256,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1AF238588D2D4EA5A416D48291406811" { - "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32\\lib\\iconv.lib" + "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32-vs2010\\lib\\iconv.lib" "TargetName" = "8:iconv.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1496,7 +1496,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2C7B5DF9CBE642149692C67FC052ECA4" { - "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll" + "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32-vs2010\\bin\\iconv.dll" "TargetName" = "8:iconv.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -1536,7 +1536,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F" { - "SourcePath" = "8:C:\\Libraries\\libxml2-2.9.2.win32\\lib\\libxml2.lib" + "SourcePath" = "8:C:\\Libraries\\libxml2-2.9.2.win32-vs2010\\lib\\libxml2.lib" "TargetName" = "8:libxml2.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1576,7 +1576,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\lib\\libeay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32-vs2010\\lib\\libeay32.lib" "TargetName" = "8:libeay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1896,7 +1896,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32-vs2010\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -2016,7 +2016,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27" { - "SourcePath" = "8:C:\\Libraries\\pcre-8.37.win32\\bin\\pcre.dll" + "SourcePath" = "8:C:\\Libraries\\pcre-8.37.win32-vs2010\\bin\\pcre.dll" "TargetName" = "8:pcre.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -2316,7 +2316,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\lib\\ssleay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32-vs2010\\lib\\ssleay32.lib" "TargetName" = "8:ssleay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -2756,7 +2756,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_88661B3BC7724CF992AC6079E040DE3A" { - "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32\\bin\\zlib1.dll" + "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32-vs2010\\bin\\zlib1.dll" "TargetName" = "8:zlib1.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -2996,7 +2996,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33" { - "SourcePath" = "8:C:\\Libraries\\pcre-8.37.win32\\lib\\pcre.lib" + "SourcePath" = "8:C:\\Libraries\\pcre-8.37.win32-vs2010\\lib\\pcre.lib" "TargetName" = "8:pcre.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -3436,7 +3436,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA3CFDD1291E474EAE85329E4C5E5D45" { - "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.6.win32\\lib\\libbz2.lib" + "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.6.win32-vs2010\\lib\\libbz2.lib" "TargetName" = "8:libbz2.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -3776,7 +3776,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win32-vs2010\\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 @@ -230,7 +230,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5" { - "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll" + "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win64-vs2010\\bin\\iconv.dll" "TargetName" = "8:iconv.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -250,7 +250,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A" { - "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.6.win64\\bin\\libbz2.dll" + "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.6.win64-vs2010\\bin\\libbz2.dll" "TargetName" = "8:libbz2.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -290,7 +290,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D" { - "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win64\\bin\\zlib1.dll" + "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win64-vs2010\\bin\\zlib1.dll" "TargetName" = "8:zlib1.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -330,7 +330,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win64\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.2d.win64-vs2010\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
