Changeset: ba0c445b8e04 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba0c445b8e04
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
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jan2014
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
debian/changelog
gdk/libbat.rc
libversions
monetdb5/modules/mal/clients.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql_scenario.c
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jan2014
vertoo.data
Branch: int128
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 708 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -558,3 +558,5 @@ fb702cba0210295b29825b095ed87d92b6645434
ce19933aa1cf72076fd33ddd485ea0303f87753f Jan2014_9
fb702cba0210295b29825b095ed87d92b6645434 Jan2014_release
14baa1e3a827c26932ec5d853feca28eacd70009 Jan2014_release
+28bad4f9c07415a7f784ac6af2494b0333c866a6 Jan2014_11
+fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_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.17.10
+%define version 11.17.12
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
URL: http://www.monetdb.org/
-Source:
http://dev.monetdb.org/downloads/sources/Jan2014/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Jan2014-SP1/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -797,6 +797,20 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
rm -fr $RPM_BUILD_ROOT
%changelog
+* Mon Mar 03 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303
+- Rebuilt.
+- BZ#3442: COPY INTO ... LOCKED reports incorrect count
+- BZ#3443: DROP INDEX crashes server with BATsubselect: invalid argument:
+ b must have a dense head
+- BZ#3444: AND after ON () of LEFT OUTER JOIN with certain expressions
+ will cause crash
+
+* Fri Feb 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303
+- buildtools: Configure now enables the SQL front end by default.
+
+* Sun Feb 16 2014 Fabian Groffen <fab...@monetdb.org> - 11.17.11-20140303
+- merovingian: monetdb destroy -f now also works on running databases
+
* Thu Feb 13 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.9-20140213
- Rebuilt.
- BZ#3435: INDEX prevents JOIN from discovering matches
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:{D6E19F3D-3911-44FE-B21D-3C987F1ACF78}"
- "PackageCode" = "8:{0DBEED5C-FA7C-4766-8429-5928BE85F95B}"
+ "ProductCode" = "8:{3FB262F6-B341-4790-8A23-378B294DD406}"
+ "PackageCode" = "8:{5E1431E1-5C5F-42CC-94F9-F81852780EB5}"
"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.17.10"
+ "ProductVersion" = "8:11.17.12"
"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:{88EBEB50-7B21-4F9C-AC12-D0CC66263DE6}"
- "PackageCode" = "8:{94217082-DBE3-4372-AC99-640FF6BD649D}"
+ "ProductCode" = "8:{54E403BA-5A1E-4903-B4EA-D0C9DB80A003}"
+ "PackageCode" = "8:{BC81A33C-7D6A-449D-956E-353399CFA59E}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.10"
+ "ProductVersion" = "8:11.17.12"
"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
@@ -2407,7 +2407,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.10\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.12\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3207,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.10\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.12\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4511,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.17.10"
+ "Name" = "8:MonetDB-SQL-11.17.12"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4553,15 +4553,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{92C611DE-5473-4C52-9057-46FEF62CBBD5}"
- "PackageCode" = "8:{C6A1860B-F78D-4187-9FFA-8E97084A163F}"
+ "ProductCode" = "8:{A198D992-3F19-4D99-A5BA-F5907295F8B4}"
+ "PackageCode" = "8:{E98D2DD4-213C-46BA-819E-FF1780F748AC}"
"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.17.10"
+ "ProductVersion" = "8:11.17.12"
"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:{2E46439C-A142-49A6-A91A-11B97E1FA217}"
- "PackageCode" = "8:{1A9D7AE5-646B-4D78-8490-EB0D1E65B6F2}"
+ "ProductCode" = "8:{3D250938-CF92-4162-9CE9-6070D5321365}"
+ "PackageCode" = "8:{BA6230D8-2073-4B57-B32A-DAFC4EA94E50}"
"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.17.10"
+ "ProductVersion" = "8:11.17.12"
"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:{14B4713F-5BD3-4870-B806-3C4C749B101A}"
- "PackageCode" = "8:{5D8FC682-248B-4657-8641-F90E1D78459B}"
+ "ProductCode" = "8:{BA0F96AF-F8FA-4923-9435-E1EAAE53082A}"
+ "PackageCode" = "8:{86839D91-D820-4CB5-A64A-86D45AAC151D}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.17.10"
+ "ProductVersion" = "8:11.17.12"
"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
@@ -2407,7 +2407,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.10\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.12\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3207,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.10\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.17.12\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4511,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.17.10"
+ "Name" = "8:MonetDB-SQL-11.17.12"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -4553,15 +4553,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{CDBCC594-5580-432F-8CF7-218473AEC3B3}"
- "PackageCode" = "8:{7320F68F-A8C1-42A9-8224-001D9776ADAC}"
+ "ProductCode" = "8:{1AF16B2E-5180-4E27-AD6E-6D9DDC5710DB}"
+ "PackageCode" = "8:{EF6C1B46-1373-4664-92BE-EEC9A2AD4B63}"
"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.17.10"
+ "ProductVersion" = "8:11.17.12"
"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
@@ -777,13 +777,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.17.10"
+#define PACKAGE_STRING "MonetDB 11.17.12"
/* 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.17.10"
+#define PACKAGE_VERSION "11.17.12"
/* Define to the home page for this package. */
#define PACKAGE_URL ""
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-2014 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.17.10
+VERSION=11.17.12
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net 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,9 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Feb 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303
+- Configure now enables the SQL front end by default.
+
* Tue Dec 10 2013 Sjoerd Mullender <sjo...@acm.org> - 11.17.1-20140114
- Created packages for RPM based systems and Debian/Ubunty containing
the MonetDB interface to the GNU Scientific Library (gsl).
diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014
--- a/buildtools/ChangeLog.Jan2014
+++ b/buildtools/ChangeLog.Jan2014
@@ -1,6 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Fri Feb 28 2014 Sjoerd Mullender <sjo...@acm.org>
-- Configure now enables the SQL front end by default.
-
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,17,10,1
- PRODUCTVERSION 11,17,10,1
+ FILEVERSION 11,17,12,1
+ PRODUCTVERSION 11,17,12,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
