Update of /cvsroot/monetdb/sql/NT/MonetDB4-SQL64
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20742/NT/MonetDB4-SQL64

Modified Files:
        MonetDB4-SQL-Installer.vdproj 
Log Message:
propagated changes of Thursday Jun 12 2008 - Friday Jun 13 2008
from the SQL_2-24 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - nielsnes:
        src/test/copy/Tests/null_as_string_errors.stable.err.Five,1.1.2.2
approve stable error output
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - romulog: src/test/Skyserver/Skyserver_tables_v6.sql,1.1.2.4
        src/test/Skyserver/Skyserver_views_v6.sql,1.1.2.3
synchronize with the skyserver module..
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - romulog: src/test/Skyserver/Skyserver_constraints_v6.sql,1.1.2.2
        src/test/Skyserver/Skyserver_dropConstraints_v6.sql,1.1.2.2
        src/test/Skyserver/Skyserver_dropTables_v6.sql,1.1.2.3
        src/test/Skyserver/Skyserver_dropViews_v6.sql,1.1.2.4
Synchronize with skyserver module...

PhotoTag is a view and not a table..
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - sjoerd: NT/MonetDB4-SQL64/MonetDB4-SQL-Installer.vdproj,1.6.2.4
        NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.3
Updated installer version number.
Make sure the 64 bit version and the 32 bit version have different "Upgrade 
Codes" so that they can be installed at the same time.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/12 - sjoerd: NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.3
Updated installer version number.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/13 - romulog: src/test/Skyserver/Skyserver_dropViews_v6.sql,1.1.2.5
        src/test/Skyserver/Skyserver_views_v6.sql,1.1.2.4
Create once 2 views
and drop correctly to avoid dependencies problems...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: MonetDB4-SQL-Installer.vdproj
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB4-SQL64/MonetDB4-SQL-Installer.vdproj,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MonetDB4-SQL-Installer.vdproj       5 Jun 2008 09:20:22 -0000       1.8
+++ MonetDB4-SQL-Installer.vdproj       13 Jun 2008 12:48:59 -0000      1.9
@@ -273,6 +273,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_46D6D3F95A4049288263806C6F45C72A"
+        "OwnerKey" = "8:_F2140ED9D2C04D0AB1367617B77EAE25"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_4850D28CDC9546EF95E164D20A0C99A2"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -321,12 +327,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_55C661B093204D01B6DF7EABE1426D68"
-        "OwnerKey" = "8:_F2140ED9D2C04D0AB1367617B77EAE25"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_58119F6597194367999F8C8287917E8E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -3862,14 +3862,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB4"
-        "ProductCode" = "8:{B2E27A5C-AFCC-4D1C-8FF5-A8A191CDBA70}"
-        "PackageCode" = "8:{9607F7BE-DAC9-47E4-B87C-B6611F5347F2}"
+        "ProductCode" = "8:{FA7BD714-CA90-4DF2-8E95-02D7C5EE31CB}"
+        "PackageCode" = "8:{00FF4EC2-8DC2-4426-A65B-72E91546E160}"
         "UpgradeCode" = "8:{8A1DA6A0-71B2-4A09-8363-040233551248}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:8.6.2"
+        "ProductVersion" = "8:8.6.13"
         "Manufacturer" = "8:CWI"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
@@ -4526,7 +4526,7 @@
         }
         "MergeModule"
         {
-            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_55C661B093204D01B6DF7EABE1426D68"
+            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_46D6D3F95A4049288263806C6F45C72A"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to