Changeset: f0e4ff5c8876 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0e4ff5c8876
Modified Files:
monetdb5/modules/mal/array.mx
sql/scripts/29_array.sql
sql/server/rel_schema.c
sql/server/rel_select.c
Branch: sciql
Log Message:
merge
diffs (truncated from 17101 to 300 lines):
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -12,7 +12,7 @@
#
# The Initial Developer of the Original Code is CWI.
# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2011 MonetDB B.V.
+# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
SUBDIRS = buildtools common clients \
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -14,7 +14,7 @@
#
# The Initial Developer of the Original Code is CWI.
# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2011 MonetDB B.V.
+# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
TOPDIR = .
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
@@ -57,6 +57,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_075F8DA3DD8740C3BBFDECF4C22753E6"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_083F00FFC47943FBB0CCF0732224E356"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -333,6 +339,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_434BAFAE4AD04443ADCFB74260E1A258"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_443E3B82885046A69D742EABC01F343B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -381,6 +393,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_4AC50B1EAC0F41CBBFDB41F68348E73E"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_4BE6673A88C34A72A463B7046D3B42AB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -453,6 +471,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_6515E74577BC4DF1A318185CF57F88AF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_655A10DAB27B4649B16EA35487EB0E10"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -489,6 +513,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_6E3061267D904D77A65F3DB28A47B2B5"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_71EDDE57D4F140FE9E660F13CEFE4D29"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -519,6 +549,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_7B3835E35ACA4987A1807A460AE4BD7E"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_7C36360D86BF42578B5EB3E664B06AA3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -981,6 +1017,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_DE3A46CB8049461DBE1B9679A0EA00A6"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_DE8131286689400787129586BC8647FF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1035,6 +1077,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_ECC791EE42884033A309D384DA3DA53A"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_ED5485FC80E04E1B8989F61F97F1A2E7"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1339,6 +1387,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_075F8DA3DD8740C3BBFDECF4C22753E6"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\lib_lsst.dll"
+ "TargetName" = "8:lib_lsst.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}:_083F00FFC47943FBB0CCF0732224E356"
{
"SourcePath" = "8:lib\\monetdb5\\run_adder.mal"
@@ -2259,6 +2327,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_434BAFAE4AD04443ADCFB74260E1A258"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\temporal.sql"
+ "TargetName" = "8:temporal.sql"
+ "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}:_443E3B82885046A69D742EABC01F343B"
{
"SourcePath" = "8:lib\\monetdb5\\pcre.mal"
@@ -2419,6 +2507,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4AC50B1EAC0F41CBBFDB41F68348E73E"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\lsst.mal"
+ "TargetName" = "8:lsst.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}:_4BE6673A88C34A72A463B7046D3B42AB"
{
"SourcePath" =
"8:lib\\monetdb5\\createdb\\21_dependency_functions.sql"
@@ -2659,6 +2767,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6515E74577BC4DF1A318185CF57F88AF"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\octopus.sql"
+ "TargetName" = "8:octopus.sql"
+ "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}:_655A10DAB27B4649B16EA35487EB0E10"
{
"SourcePath" = "8:include\\monetdb\\stream_socket.h"
@@ -2779,6 +2907,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6E3061267D904D77A65F3DB28A47B2B5"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\autoload\\80_lsst.mal"
+ "TargetName" = "8:80_lsst.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}:_71EDDE57D4F140FE9E660F13CEFE4D29"
{
"SourcePath" = "8:lib\\monetdb5\\opt_prejoin.mal"
@@ -2879,6 +3027,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7B3835E35ACA4987A1807A460AE4BD7E"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\lsst.sql"
+ "TargetName" = "8:lsst.sql"
+ "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"
@@ -4399,6 +4567,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE3A46CB8049461DBE1B9679A0EA00A6"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\parts.sql"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
