Changeset: acefd9c63b78 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=acefd9c63b78
Added Files:
clients/R/MonetDB.R/src/Makevars.win
clients/R/MonetDB.R/src/profiler.c
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/ChangeLog
clients/R/MonetDB.R/R/dbi.R
clients/R/MonetDB.R/src/mapisplit.c
clients/mapiclient/mclient.1
clients/mapiclient/mclient.c
monetdb5/optimizer/opt_querylog.c
sql/server/sql_parser.y
sql/storage/bat/bat_logger.c
sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql
sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.err
sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out
sql/test/pg_regress/Tests/case.sql
sql/test/pg_regress/Tests/case.stable.err
sql/test/pg_regress/Tests/case.stable.out
sql/test/pg_regress/Tests/inet.sql
sql/test/pg_regress/Tests/inet.stable.err
sql/test/pg_regress/Tests/inet.stable.out
sql/test/pg_regress/Tests/select_into.stable.err
Branch: default
Log Message:
Merge with default
diffs (truncated from 3602 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
@@ -39,24 +39,12 @@
}
"Entry"
{
- "MsmKey" = "8:_058ED50F0528440696254640ED80BD92"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_05D32586D7A945E1B82C9FA8FEE9D43E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0646BAED741B451BA0E3BD26C82AD4B5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_076DB41FCD394A23B579C471B0340D78"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -303,12 +291,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3D019C737F524320A531D0658533F699"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_4318EDFDA3BB4C47B87207F29EA40D5D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -387,12 +369,6 @@
}
"Entry"
{
- "MsmKey" = "8:_564F7173A973430FA6D12EEB5A656E54"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_56AECCE0BFE04F31A1A0196B93A287F9"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1112,26 +1088,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_058ED50F0528440696254640ED80BD92"
- {
- "SourcePath" = "8:lib\\monetdb5\\createdb\\19_cluster.sql"
- "TargetName" = "8:19_cluster.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}:_05D32586D7A945E1B82C9FA8FEE9D43E"
{
"SourcePath" = "8:include\\monetdb\\mapi.h"
@@ -1152,26 +1108,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0646BAED741B451BA0E3BD26C82AD4B5"
- {
- "SourcePath" = "8:lib\\monetdb5\\run_octopus.mal"
- "TargetName" = "8:run_octopus.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}:_076DB41FCD394A23B579C471B0340D78"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\80_udf.sql"
@@ -1992,26 +1928,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3D019C737F524320A531D0658533F699"
- {
- "SourcePath" = "8:lib\\monetdb5\\sql_octopus.mal"
- "TargetName" = "8:sql_octopus.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}:_4318EDFDA3BB4C47B87207F29EA40D5D"
{
"SourcePath" = "8:lib\\monetdb5\\sql_rank.mal"
@@ -2272,26 +2188,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_564F7173A973430FA6D12EEB5A656E54"
- {
- "SourcePath" = "8:lib\\monetdb5\\trader.mal"
- "TargetName" = "8:trader.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}:_56AECCE0BFE04F31A1A0196B93A287F9"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\25_debug.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
@@ -39,24 +39,12 @@
}
"Entry"
{
- "MsmKey" = "8:_058ED50F0528440696254640ED80BD92"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_05D32586D7A945E1B82C9FA8FEE9D43E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0646BAED741B451BA0E3BD26C82AD4B5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_076DB41FCD394A23B579C471B0340D78"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -303,12 +291,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3D019C737F524320A531D0658533F699"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_4318EDFDA3BB4C47B87207F29EA40D5D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -387,12 +369,6 @@
}
"Entry"
{
- "MsmKey" = "8:_564F7173A973430FA6D12EEB5A656E54"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_56AECCE0BFE04F31A1A0196B93A287F9"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1112,26 +1088,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_058ED50F0528440696254640ED80BD92"
- {
- "SourcePath" = "8:lib\\monetdb5\\createdb\\19_cluster.sql"
- "TargetName" = "8:19_cluster.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}:_05D32586D7A945E1B82C9FA8FEE9D43E"
{
"SourcePath" = "8:include\\monetdb\\mapi.h"
@@ -1152,26 +1108,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0646BAED741B451BA0E3BD26C82AD4B5"
- {
- "SourcePath" = "8:lib\\monetdb5\\run_octopus.mal"
- "TargetName" = "8:run_octopus.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}:_076DB41FCD394A23B579C471B0340D78"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\80_udf.sql"
@@ -1992,26 +1928,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3D019C737F524320A531D0658533F699"
- {
- "SourcePath" = "8:lib\\monetdb5\\sql_octopus.mal"
- "TargetName" = "8:sql_octopus.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}:_4318EDFDA3BB4C47B87207F29EA40D5D"
{
"SourcePath" = "8:lib\\monetdb5\\sql_rank.mal"
@@ -2272,26 +2188,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
