Changeset: 043c7669a876 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=043c7669a876
Added Files:
        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/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
Removed Files:
        monetdb5/optimizer/Tests/garbage.mal
        monetdb5/optimizer/Tests/garbage.stable.err
        monetdb5/optimizer/Tests/garbage.stable.out
Modified Files:
        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
        buildtools/autogen/autogen/msc.py
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/exports.stable.out
        monetdb5/mal/mal.c
        monetdb5/mal/mal.h
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_parser.c
        monetdb5/modules/atoms/uuid.mal
        monetdb5/optimizer/Tests/All
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/scheduler/run_isolate.c
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_optimizer.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/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/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.int128
        sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
        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/12-explain.stable.out
        sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
        sql/server/rel_optimizer.c
        
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
        sql/test/BugTracker-2015/Tests/All
        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/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/pg_regress/Tests/numeric.sql
        sql/test/pg_regress/Tests/numeric.stable.out
        testing/Mtest.py.in
Branch: embedded
Log Message:

merge


diffs (truncated from 3554 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
@@ -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"
@@ -370,7 +370,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.2d.win64\\bin\\ssleay32.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.2d.win64-vs2010\\bin\\ssleay32.dll"
             "TargetName" = "8:ssleay32.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -226,7 +226,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
             {
-            "SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win64\\bin\\geos_c.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\geos-3.4.2.win64-vs2010\\bin\\geos_c.dll"
             "TargetName" = "8:geos_c.dll"
             "Tag" = "8:"
             "Folder" = "8:_5A4CF78A6BC241B6AAEFF30075ECAE13"
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
@@ -1036,7 +1036,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4"
             {
-            "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win64\\lib\\zdll.lib"
+            "SourcePath" = 
"8:C:\\Libraries\\zlib-1.2.8.win64-vs2010\\lib\\zdll.lib"
             "TargetName" = "8:zdll.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1196,7 +1196,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3"
             {
-            "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:_1EC19BD0D849484790DB6A7D69758E24"
@@ -1256,7 +1256,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\libxml2-2.9.2.win64\\bin\\libxml2.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\libxml2-2.9.2.win64-vs2010\\bin\\libxml2.dll"
             "TargetName" = "8:libxml2.dll"
             "Tag" = "8:"
             "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
@@ -1316,7 +1316,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1AF238588D2D4EA5A416D48291406811"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win64\\lib\\iconv.lib"
+            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win64-vs2010\\lib\\iconv.lib"
             "TargetName" = "8:iconv.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1556,7 +1556,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2C7B5DF9CBE642149692C67FC052ECA4"
             {
-            "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:_1EC19BD0D849484790DB6A7D69758E24"
@@ -1596,7 +1596,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to