Changeset: f084387f176a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f084387f176a
Modified Files:
sql/backends/monet5/sql.mx
sql/scripts/Makefile.ag
sql/storage/store.c
Branch: sciql
Log Message:
merged from default
diffs (truncated from 751 to 300 lines):
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
@@ -489,6 +489,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_66690AE5BDB94BC5B88F10680A0FBBA4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_667BD650736E43C9A8B6899179FA0CAA"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -531,6 +537,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_740A0A7308D847629EAE5DA1A5A09B25"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_75D6121EB272461B99B03E2D03106C34"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -555,6 +567,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_7BF9C4446BB847B796DED4016FCABC6F"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_7C36360D86BF42578B5EB3E664B06AA3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -579,6 +597,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_819922DA5D7C49E7A04FFE6B6B9D3AC1"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -765,6 +789,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_AE53365835F54C5FB2C261FEAE7D3D9E"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_AEA303FD566C46F8967E6A26C9E703D3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1077,6 +1107,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_EC085DDDFAF24EEEADC0E82A90F0DDA0"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_ECC791EE42884033A309D384DA3DA53A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2827,6 +2863,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_66690AE5BDB94BC5B88F10680A0FBBA4"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\lib_opt_sql_append.dll"
+ "TargetName" = "8:lib_opt_sql_append.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "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}:_667BD650736E43C9A8B6899179FA0CAA"
{
"SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.txt"
@@ -2967,6 +3023,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_740A0A7308D847629EAE5DA1A5A09B25"
+ {
+ "SourcePath" = "8:stethoscope.bat"
+ "TargetName" = "8:stethoscope.bat"
+ "Tag" = "8:"
+ "Folder" = "8:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
+ "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}:_75D6121EB272461B99B03E2D03106C34"
{
"SourcePath" = "8:lib\\monetdb5\\blob.mal"
@@ -3047,6 +3123,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7BF9C4446BB847B796DED4016FCABC6F"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\opt_sql_append.mal"
+ "TargetName" = "8:opt_sql_append.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "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}:_7C36360D86BF42578B5EB3E664B06AA3"
{
"SourcePath" = "8:lib\\monetdb5\\identifier.mal"
@@ -3127,6 +3223,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_819922DA5D7C49E7A04FFE6B6B9D3AC1"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\autoload\\91_opt_sql_append.mal"
+ "TargetName" = "8:91_opt_sql_append.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
+ "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}:_81BF632F20E447CDA06EED62FD92D21A"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\99_system.sql"
@@ -3727,6 +3843,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AE53365835F54C5FB2C261FEAE7D3D9E"
+ {
+ "SourcePath" = "8:bin\\stethoscope.exe"
+ "TargetName" = "8:stethoscope.exe"
+ "Tag" = "8:"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
+ "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}:_AEA303FD566C46F8967E6A26C9E703D3"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\24_zorder.sql"
@@ -4767,6 +4903,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC085DDDFAF24EEEADC0E82A90F0DDA0"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\39_analytics.sql"
+ "TargetName" = "8:39_analytics.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}:_ECC791EE42884033A309D384DA3DA53A"
{
"SourcePath" = "8:lib\\monetdb5\\cache.sql"
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
@@ -321,6 +321,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_3E57AD23CD3B45A08E7DA08115DCF7AA"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_40CE1FDF32FF44AEA0C7B73E99500813"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -429,6 +435,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_59A2812AFFB04001848869CBFCEA5EBD"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_5D42439A59BD416CAF269F0D28514D47"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -651,6 +663,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_8AFA6D4BE14C486CBE56C0E908A2146E"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_8B884873843C4748A871E9481B7B8FF0"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -783,6 +801,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_A7F05B4CF16E4015B830AAD23130BCCC"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_A844F728FA11465FAF69F207DBF38DB6"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -885,6 +909,12 @@
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
