Changeset: b2073a1b0b44 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2073a1b0b44
Modified Files:
MonetDB5/MonetDB-server.spec
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
MonetDB5/src/modules/mal/Tests/xml00.stable.out
MonetDB5/src/modules/mal/Tests/xml01.stable.out
MonetDB5/src/modules/mal/Tests/xml02.stable.out
MonetDB5/src/modules/mal/Tests/xml03.stable.out
MonetDB5/src/modules/mal/Tests/xml04.stable.out
MonetDB5/src/modules/mal/Tests/xml05.stable.out
MonetDB5/src/modules/mal/Tests/xml10.stable.out
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge from Jun2010 branch.
diffs (truncated from 323 to 300 lines):
diff -r 730c1cd924e6 -r b2073a1b0b44 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Jun 23 10:41:58 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Wed Jun 23 12:33:52 2010 +0200
@@ -182,6 +182,7 @@
%dir %{_libdir}/MonetDB5
%dir %{_libdir}/MonetDB5/lib
%dir %{_libdir}/MonetDB5/autoload
+%{_libdir}/MonetDB5/autoload/*xml*.mal
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
diff -r 730c1cd924e6 -r b2073a1b0b44
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj Wed Jun 23
10:41:58 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj Wed Jun 23
12:33:52 2010 +0200
@@ -189,6 +189,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_1E640F4673BF4D94A50D359AD86002AD"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_1F665F81F90C4178A64A0D45D1468031"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1935,6 +1941,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E640F4673BF4D94A50D359AD86002AD"
+ {
+ "SourcePath" = "8:Lib\\MonetDB5\\autoload\\30_xml.mal"
+ "TargetName" = "8:30_xml.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_853248B6DA0549A48FAF7F562E7D1B8F"
+ "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}:_1F665F81F90C4178A64A0D45D1468031"
{
"SourcePath" = "8:Lib\\MonetDB5\\lib_mtime.dll"
@@ -5614,6 +5640,17 @@
"Property" = "8:_762E204C3D494003AADB714FE800A1AF"
"Folders"
{
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_853248B6DA0549A48FAF7F562E7D1B8F"
+ {
+ "Name" = "8:autoload"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" =
"8:_464AA55C3A3E47B5A5EE2363DC72DC9C"
+ "Folders"
+ {
+ }
+ }
}
}
}
diff -r 730c1cd924e6 -r b2073a1b0b44
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
--- a/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj Wed Jun 23
10:41:58 2010 +0200
+++ b/MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj Wed Jun 23
12:33:52 2010 +0200
@@ -933,6 +933,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_B35EAC82AF2741E4A18B08FA86CC4BE7"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_B4E2E55E0E234699BDCC98C58D5D0998"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -4381,6 +4387,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B35EAC82AF2741E4A18B08FA86CC4BE7"
+ {
+ "SourcePath" = "8:Lib\\MonetDB5\\autoload\\30_xml.mal"
+ "TargetName" = "8:30_xml.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_C309E2E9F9604E2CBB8CA7584F049CD3"
+ "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}:_B4E2E55E0E234699BDCC98C58D5D0998"
{
"SourcePath" = "8:Lib\\MonetDB5\\opt_mergetable.mal"
@@ -5620,6 +5646,17 @@
"Property" = "8:_762E204C3D494003AADB714FE800A1AF"
"Folders"
{
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_C309E2E9F9604E2CBB8CA7584F049CD3"
+ {
+ "Name" = "8:autoload"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" =
"8:_4D4BCF1E8B4543CD854C9EE4E6C6318E"
+ "Folders"
+ {
+ }
+ }
}
}
}
diff -r 730c1cd924e6 -r b2073a1b0b44 MonetDB5/debian/control
--- a/MonetDB5/debian/control Wed Jun 23 10:41:58 2010 +0200
+++ b/MonetDB5/debian/control Wed Jun 23 12:33:52 2010 +0200
@@ -3,8 +3,8 @@
Priority: extra
Maintainer: MonetDB BV <[email protected]>
Build-Depends: debhelper (>= 5), autotools-dev, libpcre3-dev, libssl-dev,
libraptor1-dev, libxml2-dev, libmonetdb-dev, libmonetdb-client-dev, cdbs
+Standards-Version: 3.8.0
-Standards-Version: 3.8.0
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb5-server5, adduser
diff -r 730c1cd924e6 -r b2073a1b0b44 MonetDB5/debian/libmonetdb5-server5.install
--- a/MonetDB5/debian/libmonetdb5-server5.install Wed Jun 23 10:41:58
2010 +0200
+++ b/MonetDB5/debian/libmonetdb5-server5.install Wed Jun 23 12:33:52
2010 +0200
@@ -1,3 +1,4 @@
debian/tmp/usr/lib/lib*.so.* usr/lib
debian/tmp/usr/lib/MonetDB5/lib/lib*.so* usr/lib/MonetDB5/lib
debian/tmp/usr/lib/MonetDB5/*.mal usr/lib/MonetDB5
+debian/tmp/usr/lib/MonetDB5/autoload/*.mal usr/lib/MonetDB5/autoload
diff -r 730c1cd924e6 -r b2073a1b0b44 MonetDB5/src/modules/mal/30_xml.mal
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/modules/mal/30_xml.mal Wed Jun 23 12:33:52 2010 +0200
@@ -0,0 +1,2 @@
+include xml;
+include batxml;
diff -r 730c1cd924e6 -r b2073a1b0b44 MonetDB5/src/modules/mal/Makefile.ag
--- a/MonetDB5/src/modules/mal/Makefile.ag Wed Jun 23 10:41:58 2010 +0200
+++ b/MonetDB5/src/modules/mal/Makefile.ag Wed Jun 23 12:33:52 2010 +0200
@@ -75,6 +75,13 @@
$(LIBXML2_LIBS) $(ICONV_LIBS)
}
+headers_autoload = {
+ COND = HAVE_LIBXML2
+ HEADERS = mal
+ DIR = libdir/MonetDB5/autoload
+ SOURCES = 30_xml.mal
+}
+
lib_bpm = {
DIR = libdir/MonetDB5
SEP = _
diff -r 730c1cd924e6 -r b2073a1b0b44
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Wed Jun 23 10:41:58
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Wed Jun 23 12:33:52
2010 +0200
@@ -1551,6 +1551,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_F742FD1CA61447B399F90E61D4157DC4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_FA9DDB4A77F54CF5A7E20EC1D6386115"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -6755,6 +6761,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F742FD1CA61447B399F90E61D4157DC4"
+ {
+ "SourcePath" = "8:Lib\\MonetDB5\\autoload\\30_xml.mal"
+ "TargetName" = "8:30_xml.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}:_FA9DDB4A77F54CF5A7E20EC1D6386115"
{
"SourcePath" = "8:Lib\\MonetDB5\\opt_reduce.mal"
@@ -7023,14 +7049,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{3CD21B23-9CD5-44F8-AAA8-D96F338C10A6}"
- "PackageCode" = "8:{D7BC3B0C-3C14-4903-B0BD-2D4D29B9BDC4}"
+ "ProductCode" = "8:{5106602D-7310-49E9-9AFF-6E1311A5D5FA}"
+ "PackageCode" = "8:{3BC0446B-1AEA-424B-9255-A92C2DB28EFA}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.22"
+ "ProductVersion" = "8:10.6.23"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff -r 730c1cd924e6 -r b2073a1b0b44
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Wed Jun 23
10:41:58 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Wed Jun 23
12:33:52 2010 +0200
@@ -1203,6 +1203,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_CAEBC4C88AD24AD5AE555E49284941B5"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_CB3C9EC9B4FF49E9815AC97E05BB8A46"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -5595,6 +5601,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CAEBC4C88AD24AD5AE555E49284941B5"
+ {
+ "SourcePath" = "8:Lib\\MonetDB5\\autoload\\30_xml.mal"
+ "TargetName" = "8:30_xml.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_CBC2B495BACD4CA8A55E11008F8B563D"
+ "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}:_CB3C9EC9B4FF49E9815AC97E05BB8A46"
{
"SourcePath" = "8:lib\\libmutils.dll"
@@ -7023,14 +7049,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{D5D0F43F-8638-4716-975B-ED4D6CEAC0FD}"
- "PackageCode" = "8:{76AC7B72-8281-4588-8E1B-D6DEE18AB9E2}"
+ "ProductCode" = "8:{597F6819-3742-481D-925E-41E985B53128}"
+ "PackageCode" = "8:{8063A55A-782B-4A9F-A6EB-06A3141FA713}"
"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.22"
+ "ProductVersion" = "8:10.6.23"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff -r 730c1cd924e6 -r b2073a1b0b44
sql/src/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.err
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
