Changeset: 7a1ed167c970 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a1ed167c970
Added Files:
clients/examples/python/basics.py
clients/examples/python/mclient-python2.py
clients/examples/python/mclient-python3.py
clients/examples/python/perf.py
clients/examples/python/sqlsample.py
monetdb5/tests/gdkTests/Tests/selecttst.mal
monetdb5/tests/gdkTests/Tests/selecttst.stable.err
monetdb5/tests/gdkTests/Tests/selecttst.stable.out
sql/test/BugTracker-2012/Tests/exp_bin_assertion.Bug-3209.sql
sql/test/BugTracker-2012/Tests/exp_bin_assertion.Bug-3209.stable.err
sql/test/BugTracker-2012/Tests/exp_bin_assertion.Bug-3209.stable.out
sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.sql
sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.err
sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.out
sql/test/mapi/Tests/python2_dbapi.SQL.bat
sql/test/mapi/Tests/python2_dbapi.SQL.sh
sql/test/mapi/Tests/python2_dbapi.stable.err
sql/test/mapi/Tests/python2_dbapi.stable.out
sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.bat
sql/test/mapi/Tests/python2_test_monetdb_sql.SQL.sh
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.out
sql/test/mapi/Tests/python3_dbapi.SQL.bat
sql/test/mapi/Tests/python3_dbapi.SQL.sh
sql/test/mapi/Tests/python3_dbapi.stable.err
sql/test/mapi/Tests/python3_dbapi.stable.out
sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.bat
sql/test/mapi/Tests/python3_test_monetdb_sql.SQL.sh
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.out
Removed Files:
clients/examples/python/Makefile.ag
clients/examples/python/sqlsample.py.in
clients/python2/examples/basics.py
clients/python2/examples/mclient.py
clients/python2/examples/perf.py
clients/python3/examples/basics.py
clients/python3/examples/mclient.py
clients/python3/examples/perf.py
sql/test/mapi/Tests/python_dbapi.SQL.bat
sql/test/mapi/Tests/python_dbapi.SQL.sh
sql/test/mapi/Tests/python_dbapi.stable.err
sql/test/mapi/Tests/python_dbapi.stable.out
sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
sql/test/mapi/Tests/python_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python_test_monetdb_sql.stable.out
Modified Files:
.hgtags
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/examples/Makefile.ag
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/Makefile.ag
clients/python2/setup.py
clients/python3/Makefile.ag
clients/python3/setup.py
configure.ag
debian/changelog
debian/monetdb-client-testing.install
debian/rules
gdk/gdk_select.c
gdk/gdk_setop.mx
gdk/libbat.rc
java/ChangeLog-Archive
java/ChangeLog.Oct2012
libversions
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/transaction.mal
monetdb5/tests/gdkTests/Tests/All
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Oct2012
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/sql_parser.y
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/mapi/Tests/All
testing/Mfilter.py.in
testing/Mtest.py.in
testing/cmptests.py
testing/listexports.py.in
testing/process.py
testing/subprocess26.py
vertoo.data
Branch: ssdb
Log Message:
merged from Oct2012
diffs (truncated from 3840 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -507,3 +507,5 @@ 4233be3c7f49f704e5ed466d2c1836c9dcfbb9f7
3c157ea4be5369d5718c7d578f10c0b934fbf2e6 Oct2012_release
55c1892e82a764a7a6003dded13a6228de3d1661 Oct2012_5
5ba19bc11f7691610501c95ba8d0f1d9e5083a94 Oct2012_SP1_release
+0ef42179e99bbd8450d9993cf419fcbed96cf61c Oct2012_7
+14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.13.6
+%define version 11.13.8
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]>
Group: Applications/Databases
License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
URL: http://www.monetdb.org/
-Source:
http://dev.monetdb.org/downloads/sources/Oct2012-SP1/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Oct2012-SP2/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -335,7 +335,6 @@ developer.
%{_bindir}/malsample.pl
%{_bindir}/sqlsample.php
%{_bindir}/sqlsample.pl
-%{_bindir}/sqlsample.py
%if %{?centos:0}%{!?centos:1}
%package geom-MonetDB5
@@ -634,7 +633,6 @@ developer, but if you do want to test, t
--enable-jdbc=no \
--enable-merocontrol=no \
--enable-monetdb5=yes \
- --enable-noexpand=no \
--enable-odbc=yes \
--enable-oid32=%{?oid32:yes}%{!?oid32:no} \
--enable-optimize=yes \
@@ -695,6 +693,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Wed Dec 12 2012 Sjoerd Mullender <[email protected]> - 11.13.7-20121212
+- Rebuilt.
+
+* Fri Nov 23 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212
+- java: Implemented type map support of Connection to allow custom mapping
+ of UDTs to Java classes. By default the INET and URL UDTs are
+ now mapped to nl.cwi.monetdb.jdbc.types.{INET,URL}. Most notably,
+ ResultSet.getObject() and PreparedStatement.setObject() deal with the
+ type map.
+
+* Thu Nov 22 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212
+- java: Fixed a problem in PreparedStatement where the prepared statement's
+ ResultSetMetaData (on its columns to be produced) incorrectly threw
+ exceptions about non existing columns. Bug #3192
+
+* Wed Nov 21 2012 Fabian Groffen <[email protected]> - 11.13.7-20121212
+- sql: Fixed crash when performing an INSERT on a table with string-like column
+ defaulting to NULL and omitting that column from VALUES, bug #3168
+
* Fri Nov 16 2012 Sjoerd Mullender <[email protected]> - 11.13.5-20121116
- Rebuilt.
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,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{9E9CC3AB-3B23-49E1-A53C-86428628D2F1}"
- "PackageCode" = "8:{A6D93871-4922-4D50-876B-1F272D230E68}"
+ "ProductCode" = "8:{15DCCADB-9952-447C-941D-CE5852DF26AB}"
+ "PackageCode" = "8:{0348E7E6-9D24-482E-8A48-7ED751E497F9}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.13.6"
+ "ProductVersion" = "8:11.13.8"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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,14 +425,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{A2872BA0-6932-4BAE-ACD6-F5D872DF9251}"
- "PackageCode" = "8:{FEEBC1FB-EFAA-4ACA-B8AC-EA93D3D4E797}"
+ "ProductCode" = "8:{663098B9-2A92-4593-90B8-1A025FFD4333}"
+ "PackageCode" = "8:{83F64278-29BE-4B34-8F4F-B990001B8887}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.13.6"
+ "ProductVersion" = "8:11.13.8"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -2303,7 +2303,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.13.6\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.13.8\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2943,7 +2943,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.13.6\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.13.8\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4147,7 +4147,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.13.6"
+ "Name" = "8:MonetDB-SQL-11.13.8"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4189,15 +4189,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{C648C18E-671C-4504-AB8A-7BBBF7E23F68}"
- "PackageCode" = "8:{1B294BFF-27A0-4C50-8FC4-16DF3E7D7F00}"
+ "ProductCode" = "8:{C9547E66-A744-4100-8C4E-98118287A91E}"
+ "PackageCode" = "8:{3DDD828D-B805-41DC-BD20-E7351039708E}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.13.6"
+ "ProductVersion" = "8:11.13.8"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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,15 +566,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{80643C85-EE0F-4858-8E83-5CA88D164E55}"
- "PackageCode" = "8:{A7FF3C5F-6CF2-4D7F-A51B-2476D867B5FB}"
+ "ProductCode" = "8:{F1C9A5CE-F6C6-41A2-812F-B5BD73880A9D}"
+ "PackageCode" = "8:{BBE3C769-A853-4E5A-B88B-BBD0C3F40B83}"
"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.13.6"
+ "ProductVersion" = "8:11.13.8"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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,14 +425,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{25B08D9A-40A0-4028-85D4-CE67D39FF049}"
- "PackageCode" = "8:{9CE786A8-BE8B-4BCF-B17F-D0362A3962E6}"
+ "ProductCode" = "8:{A8887DB5-7610-4333-96CE-5B232DB13BA9}"
+ "PackageCode" = "8:{FC6D5172-5C20-4B95-BE93-F48816986513}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.13.6"
+ "ProductVersion" = "8:11.13.8"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -2143,7 +2143,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.13.6\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.13.8\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3063,7 +3063,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.13.6\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.13.8\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4147,7 +4147,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.13.6"
+ "Name" = "8:MonetDB-SQL-11.13.8"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4189,15 +4189,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{8F677D86-1C10-4AC5-A7CE-BC2DF6A33F50}"
- "PackageCode" = "8:{C4F60574-2159-4058-94C8-FD4BAC26CF5E}"
+ "ProductCode" = "8:{C05D03B2-8344-4DB9-9721-B929A705D046}"
+ "PackageCode" = "8:{249648A9-940C-4A3A-8629-77FC2C319418}"
"UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.13.6"
+ "ProductVersion" = "8:11.13.8"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -689,13 +689,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.13.6"
+#define PACKAGE_STRING "MonetDB 11.13.8"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.13.6"
+#define PACKAGE_VERSION "11.13.8"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.13.6
+VERSION=11.13.8
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/clients/examples/Makefile.ag b/clients/examples/Makefile.ag
--- a/clients/examples/Makefile.ag
+++ b/clients/examples/Makefile.ag
@@ -15,4 +15,6 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = C python php
+SUBDIRS = C php
+
+EXTRA_DIST_DIR = python
diff --git a/clients/examples/python/Makefile.ag
b/clients/examples/python/Makefile.ag
deleted file mode 100644
--- a/clients/examples/python/Makefile.ag
+++ /dev/null
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
