Changeset: 52ed3a6325ff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=52ed3a6325ff
Added Files:
        clients/python2/test/test_pythonize.py
        clients/python3/test/test_pythonize.py
        debian/libmonetdb9.install
        debian/monetdb-client-tools.install
Removed Files:
        buildtools/ChangeLog.Oct2012
        clients/ChangeLog.Oct2012
        debian/libmonetdb8.install
        gdk/ChangeLog.Oct2012
        geom/ChangeLog.Oct2012
        java/ChangeLog.Oct2012
        monetdb5/ChangeLog.Oct2012
        sql/ChangeLog.Oct2012
        testing/ChangeLog.Oct2012
        tools/merovingian/ChangeLog.Oct2012
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
        clients/ChangeLog-Archive
        clients/ChangeLog.Feb2013
        clients/mapiclient/mclient.c
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python2/monetdb/control.py
        clients/python2/monetdb/mapi.py
        clients/python2/monetdb/sql/connections.py
        clients/python2/monetdb/sql/cursors.py
        clients/python2/monetdb/sql/pythonize.py
        clients/python2/setup.py
        clients/python2/test/run.sh
        clients/python2/test/runtests.py
        clients/python3/monetdb/control.py
        clients/python3/monetdb/mapi.py
        clients/python3/monetdb/sql/connections.py
        clients/python3/monetdb/sql/cursors.py
        clients/python3/monetdb/sql/pythonize.py
        clients/python3/setup.py
        clients/python3/test/dbapi20.py
        clients/python3/test/runtests.py
        configure.ag
        debian/changelog
        debian/control
        debian/monetdb-client.install
        debian/monetdb5-sql.install
        gdk/gdk_heap.c
        gdk/libbat.rc
        java/ChangeLog-Archive
        java/ChangeLog.Feb2013
        libversions
        monetdb5/ChangeLog-Archive
        monetdb5/ChangeLog.Feb2013
        monetdb5/modules/kernel/algebra.mx
        monetdb5/modules/mal/mat.h
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/Tests/optimizers.stable.out
        sql/server/sql_parser.y
        sql/server/sql_qc.c
        sql/test/ADT2006/Tests/bram.stable.out
        sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out
        sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/variable_arg_substring.SF_942981.stable.out
        sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out
        
sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
        
sql/test/BugDay_2005-11-09_2.9.3/Tests/union-duplicates.SF-1119186.stable.out
        sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
        sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out
        sql/test/BugTracker-2009/Tests/group_by_on_values.SF-2837561.stable.out
        sql/test/BugTracker-2009/Tests/not_equal.SF-2678502.stable.out
        
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
        sql/test/BugTracker-2009/Tests/push_select_down_crash.stable.out
        sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
        sql/test/BugTracker-2010/Tests/crash_on_where_in.Bug-2333.stable.out
        
sql/test/BugTracker-2010/Tests/order_by_on_single_row_view.SF-2950453.stable.out
        
sql/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out
        sql/test/BugTracker-2011/Tests/case-when-alias.Bug-2848.stable.out
        sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.stable.err
        sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.stable.out
        
sql/test/BugTracker/Tests/assert_fails_on_algebra_version.SF-2019349.stable.out
        sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
        sql/test/BugTracker/Tests/crash_on_delete.SF-1639108.stable.out
        sql/test/BugTracker/Tests/crash_on_delete.SF-1651567.stable.out
        sql/test/BugTracker/Tests/crash_on_insert.SF-1639113.stable.out
        sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
        sql/test/Dependencies/Tests/Dependencies.stable.out
        sql/test/Skyserver/Tests/Skyserver.stable.out
        sql/test/Tests/coalesce.stable.out
        sql/test/VOC/Tests/VOC.stable.out
        sql/test/bugs/Tests/crash_order_by.stable.out
        sql/test/bugs/Tests/select_from_values.stable.out
        sql/test/bugs/Tests/simple_view.stable.out
        
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
        sql/test/bugs/Tests/subselect_single_value-bug-sf-941791.stable.out
        sql/test/bugs/Tests/subselect_union-bug-sf-941826.stable.out
        sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
        sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
        sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out
        sql/test/bugs/Tests/union_all_where_1=1-bug-sf-936386.stable.out
        sql/test/leaks/Tests/check0.stable.out
        sql/test/leaks/Tests/check0_nogeom.stable.out
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check1_nogeom.stable.out
        sql/test/leaks/Tests/check2.stable.out
        sql/test/leaks/Tests/check2_nogeom.stable.out
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check3_nogeom.stable.out
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check4_nogeom.stable.out
        sql/test/leaks/Tests/check5.stable.out
        sql/test/leaks/Tests/check5_nogeom.stable.out
        sql/test/leaks/Tests/drop3.stable.out
        sql/test/leaks/Tests/drop3_nogeom.stable.out
        sql/test/leaks/Tests/temp1.stable.out
        sql/test/leaks/Tests/temp1_nogeom.stable.out
        sql/test/leaks/Tests/temp2.stable.out
        sql/test/leaks/Tests/temp2_nogeom.stable.out
        sql/test/leaks/Tests/temp3.stable.out
        sql/test/leaks/Tests/temp3_nogeom.stable.out
        sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
        sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
        sql/test/pg_regress/Tests/char.stable.out
        sql/test/pg_regress/Tests/strings_concat.stable.out
        sql/test/pg_regress/Tests/text.stable.out
        sql/test/pg_regress/Tests/varchar.stable.out
        sql/test/rdf/Tests/q2_28_v.stable.out
        sql/test/rdf/Tests/q2_v.stable.out
        sql/test/rdf/Tests/q3_28_v.stable.out
        sql/test/rdf/Tests/q3_v.stable.out
        sql/test/rdf/Tests/q4_28_v.stable.out
        sql/test/rdf/Tests/q4_v.stable.out
        sql/test/rdf/Tests/q6_28_v.stable.out
        sql/test/rdf/Tests/q6_v.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        testing/ChangeLog-Archive
        testing/ChangeLog.Feb2013
        testing/Mtest.py.in
        tools/merovingian/ChangeLog-Archive
        tools/merovingian/ChangeLog.Feb2013
        tools/mserver/mserver5.c
        vertoo.data
Branch: ssdb
Log Message:

merged from Feb2013


diffs (truncated from 3673 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -513,3 +513,5 @@ 0ef42179e99bbd8450d9993cf419fcbed96cf61c
 14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release
 0d23123db0a3fd8564564c46789e8e549320c77b Oct2012_9
 1f74df406780bccca94e6128c6c62a0b101fc847 Oct2012_SP3_release
+693187b90b57a610779caa942efe7514372125ee Feb2013_1
+23894afae1679eb37e6866a793ba00782c4b0804 Feb2013_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.15.0
+%define version 11.15.2
 %{!?buildno: %define buildno %(date +%Y%m%d)}
 
 # groups of related archs
@@ -27,7 +27,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/Oct2012-SP3/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Feb2013/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -143,11 +143,28 @@ MonetDB, you will very likely need this 
 %defattr(-,root,root)
 %{_bindir}/mclient
 %{_bindir}/msqldump
-%{_bindir}/stethoscope
 %{_libdir}/libmapi.so.*
 %doc %{_mandir}/man1/mclient.1.gz
 %doc %{_mandir}/man1/msqldump.1.gz
 
+%package client-tools
+Summary: MonetDB - Monet Database Management System Client Programs
+Group: Applications/Databases
+Requires: %{name}-client = %{version}-%{release}
+
+%description client-tools
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators.  It also has an SQL frontend.
+
+This package contains stethoscope and tomograph.
+
+%files client-tools
+%defattr(-,root,root)
+%{_bindir}/stethoscope
+%{_bindir}/tomograph
+
 %package client-devel
 Summary: MonetDB - Monet Database Management System Client Programs
 Group: Applications/Databases
@@ -688,7 +705,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 # .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la
 # internal development stuff
-rm -f $RPM_BUILD_ROOT%{_bindir}/calibrator
 rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
 rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.so
@@ -706,6 +722,68 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212
+- Rebuilt.
+
+* Thu Jan 17 2013 Stefan Manegold <stefan.maneg...@cwi.nl> - 11.15.1-20130212
+- testing:
+enabled "top-level" Mtest.py
+So far, while Mtest.py could be called in any subdirectory of the MonetDB
+source tree (and could then run all tests in the entire sub-tree),
+it was not possible to call Mtest.py in the top-level MonetDB source
+directory to run all tests.  Instead, to run all tests, Mtest.py had to
+be called at least 4 times, once in each of these directories: "clients",
+"monetdb5", "sql", "geom".
+Now, it is possible to call Mtest.py once in the top-level MonetDB source
+directory to run all tests in one go.
+The behaviour of calling Mtest.py in any subdirectory, including the
+four mentioned above, did not changed, other than that now obsolete
+command line options "-p / --package <package>" and "-5 / --monetdb5"
+have been removed.
+
+* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212
+- clients: Mapi protocol v8 support was removed from all client drivers.  
Protocol
+  v8 has not been used by the servers any more since Apr2012 release
+- clients: The tool mnc was removed from installations
+
+* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212
+- java: merocontrol was changed to return server URIs, and lastStop time.
+  Connections and dbpath were removed.
+- java: Mapi protocol v8 support was removed from MapiSocket.  Protocol
+  v8 has not been used by the servers any more since Apr2012 release
+
+* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212
+- merovingian: Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped
+
+* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212
+- merovingian: monetdb status now uses a more condensed output, to cater for 
the uris
+  being shown, and prints how long a database is stopped, or how long
+  ago it crashed
+
+* Tue Jan 15 2013 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212
+- merovingian: monetdb status now prints the connection uri for each database,
+  when available.  The connections and database path properties have
+  been dropped.
+
+* Tue Jan 15 2013 Fabian Groffen <fab...@cwi.nl> - 11.15.1-20130212
+- merovingian: monetdb status now prints last crash date only if the database 
has
+  not been started since.
+
+* Tue Jan 15 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212
+- monetdb5: mserver5: The --dbname and --dbfarm options have been replaced by 
the
+  single --dbpath option.
+
+* Tue Jan 15 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212
+- clients: msqldump: Implmented an option (--table/-t) to dump a single table.
+- clients: Changed msqdump's trace option to be in line with mclient.  In both
+  cases, the long option is --Xdebug and the short option is -X.
+
+* Tue Jan 15 2013 Martin Kersten <m...@cwi.nl> - 11.15.1-20130212
+- monetdb5: The scheduler of mserver5 was changed to use a fixed set of 
workers to
+  perform the work for all connected clients.  Previously, each client
+  connection had its own set of workers, easily causing resource problems
+  upon multiple connections to the server.
+
 * Tue Jan 15 2013 Sjoerd Mullender <sjo...@acm.org> - 11.13.9-20130115
 - Rebuilt.
 
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
@@ -566,15 +566,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB ODBC Driver"
-        "ProductCode" = "8:{4E161B98-9FC8-4512-97D8-EA76C354DA4D}"
-        "PackageCode" = "8:{D7B51DE5-F620-464F-89E1-5DE3D9103AB2}"
+        "ProductCode" = "8:{8525DDA0-C5DC-49BC-9ED5-03D4045BE652}"
+        "PackageCode" = "8:{CF28B9EE-153E-4DDE-A3F6-14653A2B3246}"
         "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.15.0"
+        "ProductVersion" = "8:11.15.2"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -425,14 +425,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB5 SQL GIS Module"
-        "ProductCode" = "8:{A61BE52A-99A2-4503-BB5B-3837B0708862}"
-        "PackageCode" = "8:{5F8AB146-C5BB-4961-95DE-9848D2AF533A}"
+        "ProductCode" = "8:{1F053186-2D61-4D50-80F8-5B3865A0A2B8}"
+        "PackageCode" = "8:{FBD06E05-92C9-4DC4-82C8-36D56B4A68B6}"
         "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.15.0"
+        "ProductVersion" = "8:11.15.2"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -231,6 +231,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_3B793520B49D47C18CC14D2B737DA38C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1721,6 +1727,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+            {
+            "SourcePath" = "8:lib\\monetdb5\\createdb\\75_storagemodel.sql"
+            "TargetName" = "8:75_storagemodel.sql"
+            "Tag" = "8:"
+            "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+            "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}:_3B793520B49D47C18CC14D2B737DA38C"
             {
             "SourcePath" = "8:lib\\monetdb5\\microbenchmark.mal"
@@ -2303,7 +2329,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.15.0\\dump-restore.txt"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.15.2\\dump-restore.txt"
             "TargetName" = "8:dump-restore.txt"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2943,7 +2969,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.15.0\\dump-restore.html"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.15.2\\dump-restore.html"
             "TargetName" = "8:dump-restore.html"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4147,7 +4173,7 @@
                                 {
                                     
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
                                     {
-                                    "Name" = "8:MonetDB-SQL-11.15.0"
+                                    "Name" = "8:MonetDB-SQL-11.15.2"
                                     "AlwaysCreate" = "11:FALSE"
                                     "Condition" = "8:"
                                     "Transitive" = "11:FALSE"
@@ -4189,15 +4215,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB5"
-        "ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"
-        "PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"
+        "ProductCode" = "8:{3A4A01F2-56A8-4186-BA57-E88DCA74E170}"
+        "PackageCode" = "8:{0983C2AD-5F94-4F39-A29C-84B973116A01}"
         "UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.15.0"
+        "ProductVersion" = "8:11.15.2"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -566,15 +566,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB ODBC Driver"
-        "ProductCode" = "8:{0DD096EA-A791-4D97-AD3C-5EC69F2A495E}"
-        "PackageCode" = "8:{B6C87B73-7277-46B8-B443-65665B5A634C}"
+        "ProductCode" = "8:{21AA0B47-910B-4EBD-9112-86709D2E88D4}"
+        "PackageCode" = "8:{D9856FBB-6BEC-483D-972F-80ABFEA4A30E}"
         "UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.15.0"
+        "ProductVersion" = "8:11.15.2"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -425,14 +425,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB5 SQL GIS Module"
-        "ProductCode" = "8:{BD1A3C71-3A8E-421D-922D-2B7A19926B5C}"
-        "PackageCode" = "8:{471DD1DA-9C69-4289-821D-4CC329A8BA94}"
+        "ProductCode" = "8:{DFB1FF71-F3C4-45BF-A865-29439079736E}"
+        "PackageCode" = "8:{807D6ABF-0671-40A0-88DA-C528BE7FCF9C}"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to