Changeset: 39e2273df38e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39e2273df38e
Added Files:
sql/scripts/39_analytics.sql
sql/test/Tests/setoptimizer.stable.out.Windows
Modified Files:
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
clients/ChangeLog.Apr2012
clients/Tests/exports.stable.out
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
clients/mapiclient/mclient.1
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
clients/odbc/driver/ODBCDbc.c
clients/odbc/driver/ODBCDbc.h
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLExecDirect.c
clients/odbc/driver/SQLExecute.c
clients/odbc/driver/SQLFetch.c
clients/odbc/driver/SQLGetConnectAttr.c
clients/odbc/driver/SQLMoreResults.c
clients/odbc/driver/SQLSetConnectAttr.c
common/stream/stream.c
common/stream/stream.h
monetdb5/Makefile.ag
monetdb5/mal/mal_resolve.mx
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
monetdb5/optimizer/opt_pipes.c
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/common/sql_types.c
sql/rel.txt
sql/scripts/23_skyserver.sql
sql/scripts/Makefile.ag
sql/server/rel_schema.c
sql/server/sql_mvc.c
sql/storage/bat/bat_logger.c
sql/storage/store.c
sql/test/BugConstraints/Tests/add_constraint_1643522.stable.err
sql/test/BugConstraints/Tests/drop_column_1643542.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/limit_in_create_view.SF-924448.stable.err
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.stable.err
sql/test/BugTracker-2009/Tests/drop-sequence-crash.SF-2854195.stable.err
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.err
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.err
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.stable.err
sql/test/zones.sql
tools/merovingian/ChangeLog.Apr2012
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/mserver/mserver5.1
Branch: gdk-calc
Log Message:
Merge with default branch.
diffs (truncated from 3809 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
@@ -566,8 +566,8 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{F553EDA6-208A-4F89-9783-7ADA935E014A}"
- "PackageCode" = "8:{C3CFF53E-BE5C-4C30-B071-847452592499}"
+ "ProductCode" = "8:{4E161B98-9FC8-4512-97D8-EA76C354DA4D}"
+ "PackageCode" = "8:{D7B51DE5-F620-464F-89E1-5DE3D9103AB2}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
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,8 +425,8 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{0EB6FD98-A8BB-4E40-A6AB-D0258F937766}"
- "PackageCode" = "8:{28CF4984-296C-4CC3-8049-9CE19CC68F1E}"
+ "ProductCode" = "8:{A61BE52A-99A2-4503-BB5B-3837B0708862}"
+ "PackageCode" = "8:{5F8AB146-C5BB-4961-95DE-9848D2AF533A}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
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"
@@ -5255,8 +5411,8 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{3639864D-963F-4E5C-A087-17A25EEEC36F}"
- "PackageCode" = "8:{18713244-E915-4623-ABB4-FBA11E0CA986}"
+ "ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"
+ "PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
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,8 +566,8 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{BCA28DEE-33C4-4897-85D5-98DA9747054A}"
- "PackageCode" = "8:{D107C833-4867-4471-B5E7-36C3A5C26F2E}"
+ "ProductCode" = "8:{0DD096EA-A791-4D97-AD3C-5EC69F2A495E}"
+ "PackageCode" = "8:{B6C87B73-7277-46B8-B443-65665B5A634C}"
"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
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,8 +425,8 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
