Changeset: edb5a30c0d48 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edb5a30c0d48
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
clients/ChangeLog.Jul2012
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/SQLDescribeCol.c
clients/odbc/driver/SQLNativeSql.c
sql/test/Tests/setoptimizer.stable.out.Windows
Branch: default
Log Message:
Merge with Jul2012 branch.
Fixed a bunch of conflicts by hand.
diffs (truncated from 1207 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
@@ -15,6 +15,12 @@
{
"Entry"
{
+ "MsmKey" = "8:_11741B73503C4B6AA61599A42BA38851"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_14F4BC1A7F54458D91CFA4A0BD174604"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -57,7 +63,7 @@
}
"Entry"
{
- "MsmKey" = "8:_84999A6BF369454381F5ACB44DAAD420"
+ "MsmKey" = "8:_64A4AC448DEF46D89377E6F79019D632"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
@@ -69,12 +75,6 @@
}
"Entry"
{
- "MsmKey" = "8:_B4FE8AF57D0147A5926576F3D73B9B3B"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_BC1CD3A227FA4EB7B035DFA62EF4D82C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -208,6 +208,26 @@
}
"File"
{
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_11741B73503C4B6AA61599A42BA38851"
+ {
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\libeay32.dll"
+ "TargetName" = "8:libeay32.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
+ "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}:_14F4BC1A7F54458D91CFA4A0BD174604"
{
"SourcePath" = "8:monetdb.ico"
@@ -328,10 +348,10 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_84999A6BF369454381F5ACB44DAAD420"
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_64A4AC448DEF46D89377E6F79019D632"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\libeay32.dll"
- "TargetName" = "8:libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\ssleay32.dll"
+ "TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
"Condition" = "8:"
@@ -368,26 +388,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4FE8AF57D0147A5926576F3D73B9B3B"
- {
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\ssleay32.dll"
- "TargetName" = "8:ssleay32.dll"
- "Tag" = "8:"
- "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
- "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}:_BC1CD3A227FA4EB7B035DFA62EF4D82C"
{
"SourcePath" = "8:lib\\libstream.dll"
@@ -569,6 +569,7 @@
"ProductCode" = "8:{4E161B98-9FC8-4512-97D8-EA76C354DA4D}"
"PackageCode" = "8:{D7B51DE5-F620-464F-89E1-5DE3D9103AB2}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
@@ -1206,7 +1207,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
+ "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x86.msm"
"Properties"
{
}
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
@@ -33,12 +33,6 @@
}
"Entry"
{
- "MsmKey" = "8:_0607DD25BFA34B92B0BF84584D3D8BCA"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_0629084AD55F45E68F61C23D1DE3973D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -93,6 +87,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_194A6F995A234CC5B8650C94DB016E7D"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_1AF238588D2D4EA5A416D48291406811"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -219,6 +219,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_408C39BCDDB245629617C46A515FDE5B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_413464588B6642879CEB44B551365733"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -495,12 +501,6 @@
}
"Entry"
{
- "MsmKey" = "8:_929EE4AE7E524A1CBC69C7718D412876"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_93CA9CC1926A47799A85CA3B714E124B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -627,12 +627,6 @@
}
"Entry"
{
- "MsmKey" = "8:_BA22F04D137D421199EB04EE1D228A8F"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_BC1C1FC22A804319853B31D079C4B80A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -651,12 +645,6 @@
}
"Entry"
{
- "MsmKey" = "8:_C3D9984F15D64164AECDEFF66981A97E"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_C4FD8AE67BD1421DADB1D732EE568C07"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -819,6 +807,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_F0E97FF56DD3481A9F8E9E678CF5FF20"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_F2F5DBA5F4ED478BB2F5C2CFF3E00856"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -855,6 +849,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_F8FBE794D0B1450A8AA40FD71D4F0E73"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_F9E0136B7F4843BDBC9E432825DC830D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1007,26 +1007,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0607DD25BFA34B92B0BF84584D3D8BCA"
- {
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\lib\\libeay32.lib"
- "TargetName" = "8:libeay32.lib"
- "Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
- "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}:_0629084AD55F45E68F61C23D1DE3973D"
{
"SourcePath" = "8:lib\\monetdb5\\sql.mal"
@@ -1207,6 +1187,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_194A6F995A234CC5B8650C94DB016E7D"
+ {
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\ssleay32.dll"
+ "TargetName" = "8:ssleay32.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "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}:_1AF238588D2D4EA5A416D48291406811"
{
"SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\lib\\iconv.lib"
@@ -1627,6 +1627,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_408C39BCDDB245629617C46A515FDE5B"
+ {
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\lib\\ssleay32.lib"
+ "TargetName" = "8:ssleay32.lib"
+ "Tag" = "8:"
+ "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
