Changeset: e9f518b10de9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9f518b10de9
Modified Files:
Branch: Dec2011
Log Message:
Merged with Dec2011-SP1 release
diffs (truncated from 757 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -469,3 +469,5 @@ 6dbadba38a4635b6319f2ba966f5dde6efab037d
2373eb4ee98b690aa72b86bebf4b2b47c87aa77c Dec2011_5
6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release
32665cf67d03011ff1fcc2c8e118370c47e5fae6 Dec2011_release
+d159bb1ba293002773b896353854b14aeb4e5cd1 Dec2011_7
+f47248f30989933b245a4d6f2e31a9e443f1078b Dec2011_SP1_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.7.6
+%define version 11.7.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/Dec2011/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Dec2011-SP1/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -626,6 +626,52 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Feb 24 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- Rebuilt.
+
+* Wed Feb 22 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- buildtools: Fixed some of the package names for Debian/Ubuntu. Packages for
+ libraries should contain the major number of the library version number.
+ This was not always the case.
+
+* Mon Feb 20 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- java: Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL
+ error when called with catalog and schema argument.
+
+* Fri Feb 17 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- merovingian: Fixed a bug in the multiplex-funnel where certain clients would
abort
+ on responses for update queries.
+
+* Fri Feb 17 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- sql: Fixed a crash that happened at the end of a database upgrade to the
+ Dec2011 database scheme. The crash happened during cleanup after the
+ database was upgraded, so it was merely inconvenient.
+
+* Wed Feb 15 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- sql: Stripped off implementation-specific parts from error messages before
+ they get presented to the user.
+
+* Tue Feb 14 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- java: Resolved a bug where JDBC and Control connections could terminate
+ abruptly with 'Connection closed' messages
+
+* Thu Feb 9 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- monetdb5: Fixed potential crash by dealing better with non-standard types.
+
+* Tue Feb 7 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- buildtools: On Debian and Ubuntu, install Python modules in dist-packages
instead
+ of site-packages. This fixed bug 2997.
+
+* Mon Jan 30 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- merovingian: Fixed problem where version and mserver properties for monetdbd
were
+ not always successfully retrieved. Bug #2982.
+- merovingian: Fixed problem where shutdown of monetdbd would lead to shutting
down
+ database 'control' which does not exist. Bug #2983.
+- merovingian: Fixed issue causing (harmless) 'error reading from control
channel'
+ messages. Bug #2984.
+- merovingian: Resolved problem where remote start/stop/etc. commands with
monetdb
+ would report error 'OK'. Bug #2984.
+
* Fri Jan 20 2012 Sjoerd Mullender <[email protected]> - 11.7.5-20120120
- 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,14 +566,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{37C50AF1-7645-43FB-94A7-2D882771BAC4}"
- "PackageCode" = "8:{F06FFDE6-6CA6-49AE-B617-F34FF76BA095}"
+ "ProductCode" = "8:{DF999C41-4672-4D4C-8AE3-1C4250E4D9BA}"
+ "PackageCode" = "8:{D2556432-3D59-4BC9-95A2-D418C589099C}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.7.6"
+ "ProductVersion" = "8:11.7.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:{F61FD90E-8BEC-48E8-B132-B9553E883F69}"
- "PackageCode" = "8:{100E5500-01A6-4049-A931-0CEC2645B32F}"
+ "ProductCode" = "8:{77B50428-3076-4A1C-9CC9-3F03C87FDE63}"
+ "PackageCode" = "8:{55426D02-1A2F-43EB-AAD7-BAA4FAE4D84B}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.7.6"
+ "ProductVersion" = "8:11.7.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
@@ -2829,7 +2829,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.7.6\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.7.8\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3629,7 +3629,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.7.6\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.7.8\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5213,7 +5213,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.7.6"
+ "Name" = "8:MonetDB-SQL-11.7.8"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5255,15 +5255,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{FD28AB2B-1A07-4775-8F0F-2E5093781424}"
- "PackageCode" = "8:{76B4C0F9-6CBB-44A8-A105-E910C8208E93}"
+ "ProductCode" = "8:{71272335-01EB-4864-8864-A042964A667F}"
+ "PackageCode" = "8:{27111CA9-EC35-47C9-B312-BBE8E86D1DD2}"
"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.7.6"
+ "ProductVersion" = "8:11.7.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,14 +566,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{1C41674F-384D-4FF5-8C23-229AC4ED92B3}"
- "PackageCode" = "8:{4A50F754-3916-42F1-8778-50657AEE6C1F}"
+ "ProductCode" = "8:{CD1B25BE-2DF5-4E0C-8EBE-26D6F183F1CD}"
+ "PackageCode" = "8:{5540236F-D29A-4C4C-8AC9-6FA1C009E03B}"
"UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.7.6"
+ "ProductVersion" = "8:11.7.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:{A426D27F-5954-4082-B8BA-8C684909CB28}"
- "PackageCode" = "8:{2C59B3A5-8BA6-4BCA-9C03-C939F94FE3E6}"
+ "ProductCode" = "8:{8FB43C2F-C27A-45E6-83DB-05B82383716F}"
+ "PackageCode" = "8:{292757B8-583C-4E3C-9CE3-E3FC4F87BE62}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.7.6"
+ "ProductVersion" = "8:11.7.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
@@ -2769,7 +2769,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.7.6\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.7.8\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3809,7 +3809,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.7.6\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.7.8\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5213,7 +5213,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.7.6"
+ "Name" = "8:MonetDB-SQL-11.7.8"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5255,15 +5255,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{CB81B690-384A-4F7C-94E0-43B385987BAC}"
- "PackageCode" = "8:{FC6397D6-E52A-4718-9E3D-6B70A1B1E7C8}"
+ "ProductCode" = "8:{DF75A448-BAC4-4D0B-A28C-722F91AAAF0F}"
+ "PackageCode" = "8:{01DAD75D-FB94-446F-9873-D5F7C47C45FA}"
"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.7.6"
+ "ProductVersion" = "8:11.7.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
@@ -743,13 +743,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.7.6"
+#define PACKAGE_STRING "MonetDB 11.7.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.7.6"
+#define PACKAGE_VERSION "11.7.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.7.6
+VERSION=11.7.8
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,15 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
