Changeset: 9a159e99a4ca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a159e99a4ca
Added Files:
monetdb5/extras/jaql/jaqltests/Tests/documents.jaql
monetdb5/extras/jaql/jaqltests/Tests/documents.stable.err
monetdb5/extras/jaql/jaqltests/Tests/documents.stable.out
monetdb5/mal/Tests/uselecttest.mal
monetdb5/modules/kernel/Tests/batstr.mal
monetdb5/modules/kernel/Tests/batstr.stable.err
monetdb5/modules/kernel/Tests/batstr.stable.out
Removed Files:
monetdb5/modules/kernel/Tests/LICENSE
Modified Files:
.hgtags
HowToStart.rst
MonetDB.spec
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
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
clients/python3/setup.py
configure.ag
debian/changelog
gdk/gdk_select.c
gdk/libbat.rc
java/ChangeLog-Archive
java/ChangeLog.Oct2012
monetdb5/extras/jaql/Tests/json00.mal
monetdb5/extras/jaql/Tests/json00.stable.out
monetdb5/extras/jaql/jaqlfunc.mal
monetdb5/extras/jaql/jaqltests/Tests/All
monetdb5/extras/jaql/json.c
monetdb5/mal/Tests/performanceTests/performanceLog
monetdb5/mal/Tests/performanceTests/tst400a.mal
monetdb5/mal/Tests/performanceTests/tst400cHuge.mal
monetdb5/mal/Tests/performanceTests/tst400d.mal
monetdb5/mal/Tests/performanceTests/tst901a.mal
monetdb5/mal/Tests/performanceTests/tst901b.mal
monetdb5/modules/kernel/Tests/All
monetdb5/modules/kernel/batstr.c
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: rdf
Log Message:
Merge with default branch
diffs (truncated from 202693 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -503,3 +503,6 @@ f8e913e56b99223764b1c22f526087d6bcad2656
2d08000a18ddbe8f2cc3f12e09b6def8e53ae53a Oct2012_1
4233be3c7f49f704e5ed466d2c1836c9dcfbb9f7 Oct2012_release
d762ae2e83bd42a48aebf0ebb051a643f77f77d7 Lod2_D2_5_Deliverable_MonetDBRDF
+6f4501510506b9f074351d5b592a2a745b296571 Oct2012_3
+4233be3c7f49f704e5ed466d2c1836c9dcfbb9f7 Oct2012_release
+3c157ea4be5369d5718c7d578f10c0b934fbf2e6 Oct2012_release
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -324,7 +324,7 @@ in the package top-level directory issue
Mtest.py -r [--package=<package>]
-where *package* is one of ``clients``, ``MonetDB5`` or ``sql``
+where *package* is one of ``clients``, ``monetdb5`` or ``sql``
(the ``--package=<package>`` option can be omitted when
using a Mercurial checkout; see
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -695,6 +695,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Tue Oct 16 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.3-20121016
+- Rebuilt.
+
+* Wed Oct 10 2012 Fabian Groffen <fab...@cwi.nl> - 11.13.3-20121016
+- java: Fixed problem with PreparedStatements and setXXX() methods using column
+ numbers instead of names, bug #3158
+
* Wed Oct 10 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.1-20121010
- Rebuilt.
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
@@ -21,6 +21,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_03E4CB5550E2405DB1D01450DAB51EB3"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_0589C6F724D0421C9C909F12DA19B36A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -75,12 +81,24 @@
}
"Entry"
{
+ "MsmKey" = "8:_10584133EE8047D688FBC01F2AED6EB0"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_13440C2EDE6842BF8D9F24F554EEB87F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_1445035540B54519B1090EBEAF8B9F5C"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_15E2F9C224BC494DBFDBDC5F2240C5B8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -135,6 +153,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_21FB7083CF534CECA100E30891462617"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_2267095870CB48B3954DC1293ADF4ED1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -153,6 +177,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_29235355A89E4CE398E353AC8D8C5589"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_2C7B5DF9CBE642149692C67FC052ECA4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -321,6 +351,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_5BAEA981D4F9422DAF4AE4D43DAFF0FC"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_5D2FF1128C0842A5A9AF6E69BD1B52EA"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -333,6 +369,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_5F9503044C8F466EBEB5D924F1FE5C13"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_611BE5BF52AE42FEAC98E33662E1AA69"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -465,6 +507,18 @@
}
"Entry"
{
+ "MsmKey" = "8:_8CF0D966057D40D8951B67F17E21F8D9"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_8E4C682FF8654D7CBAC4E000B4580B36"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_90B787B0D72D45E9A83F3507CEB9EA60"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -501,6 +555,18 @@
}
"Entry"
{
+ "MsmKey" = "8:_9DF44FEB778F47408CA24C054AF8F9B5"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_A000F45BF7AF49C49840BE5B62CC33D9"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_A3D30B4921134893BC9CB00AFA2F678E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -531,6 +597,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_A72836DA12364DC487997DA532824457"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -579,6 +651,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_B2F3BC1050334F4EBDA85AE1E7E33BF7"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_B324CE6ED76F48B8877875FE0D2C9D54"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -819,10 +897,28 @@
}
"Entry"
{
+ "MsmKey" = "8:_FBF44D32BD554068B42FE3AAB9C0191D"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_FEBCE26E183F4673BFA57C6EFD59AB26"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
+ "Entry"
+ {
+ "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_FF42D3A8222F4F898F9BAB48F02EBC29"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
}
"Configurations"
{
@@ -925,6 +1021,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03E4CB5550E2405DB1D01450DAB51EB3"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\jaql.mal"
+ "TargetName" = "8:jaql.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}:_0589C6F724D0421C9C909F12DA19B36A"
{
"SourcePath" = "8:lib\\monetdb5\\calc.mal"
@@ -1105,6 +1221,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_10584133EE8047D688FBC01F2AED6EB0"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\inet.mal"
+ "TargetName" = "8:inet.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}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.dll"
@@ -1125,6 +1261,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1445035540B54519B1090EBEAF8B9F5C"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\color.mal"
+ "TargetName" = "8:color.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"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
