Changeset: 40f976401bdc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40f976401bdc Modified Files: Branch: default Log Message:
merge diffs (truncated from 653 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -435,3 +435,4 @@ be8749b7640878f829575ef9daa995810d6fe25d Oct2010_3 3dc7b6687e454fc31ce9d3887aa01e457de4e9f2 Mar2011_root e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1 +8a1a1b65992cd98423eee70cef0986beb3b7360d Apr2011_root diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.2.0 +%define version 11.4.0 %{!?buildno: %define buildno %(date +%Y%m%d)} # groups of related archs 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 @@ -573,7 +573,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.2.0" + "ProductVersion" = "8:11.4.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" 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 @@ -432,7 +432,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.2.0" + "ProductVersion" = "8:11.4.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" 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 @@ -2665,7 +2665,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.4.0\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -3705,7 +3705,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.4.0\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -5109,7 +5109,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.2.0" + "Name" = "8:MonetDB-SQL-11.4.0" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -5158,7 +5158,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.2.0" + "ProductVersion" = "8:11.4.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" 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 @@ -573,7 +573,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.2.0" + "ProductVersion" = "8:11.4.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" 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 @@ -432,7 +432,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.2.0" + "ProductVersion" = "8:11.4.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" 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 @@ -2665,7 +2665,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.4.0\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -3705,7 +3705,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.2.0\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.4.0\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -5109,7 +5109,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.2.0" + "Name" = "8:MonetDB-SQL-11.4.0" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -5158,7 +5158,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.2.0" + "ProductVersion" = "8:11.4.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" 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-2011 MonetDB B.V. # All Rights Reserved. -VERSION=11.2.0 +VERSION=11.4.0 # ^^^^^^ # 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 b/buildtools/ChangeLog.Apr2011 copy from buildtools/ChangeLog copy to buildtools/ChangeLog.Apr2011 diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,11 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Mon Feb 7 2011 Fabian Groffen <fab...@cwi.nl> -- Remove XQuery related code from Ruby adapter, PHP driver and Perl Mapi - library - -* Thu Feb 3 2011 Fabian Groffen <fab...@cwi.nl> -- Make SQL the default language for mclient, e.g. to use when --language= - or -l is omitted - diff --git a/clients/ChangeLog b/clients/ChangeLog.Apr2011 copy from clients/ChangeLog copy to clients/ChangeLog.Apr2011 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,2,0,1 - PRODUCTVERSION 11,2,0,1 + FILEVERSION 11,4,0,1 + PRODUCTVERSION 11,4,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ VALUE "Comments", "\0" VALUE "CompanyName", "CWI\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", "11.2.0\0" + VALUE "FileVersion", "11.4.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", "11.2.0\0" + VALUE "ProductVersion", "11.4.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc --- a/clients/odbc/driver/driver.rc +++ b/clients/odbc/driver/driver.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,2,0,1 - PRODUCTVERSION 11,2,0,1 + FILEVERSION 11,4,0,1 + PRODUCTVERSION 11,4,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ VALUE "Comments", "\0" VALUE "CompanyName", "CWI\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", "11.2.0\0" + VALUE "FileVersion", "11.4.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ VALUE "OriginalFilename", "libMonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB SQL Server\0" - VALUE "ProductVersion", "11.2.0\0" + VALUE "ProductVersion", "11.4.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc --- a/clients/odbc/winsetup/setup.rc +++ b/clients/odbc/winsetup/setup.rc @@ -62,8 +62,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 11,2,0,1 - PRODUCTVERSION 11,2,0,1 + FILEVERSION 11,4,0,1 + PRODUCTVERSION 11,4,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -80,12 +80,12 @@ BEGIN VALUE "CompanyName", "CWI" VALUE "FileDescription", "MonetDB ODBC Setup DLL" - VALUE "FileVersion", "11.2.0" + VALUE "FileVersion", "11.4.0" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright (c) MonetDB BV 2008-2011" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", "11.2.0" + VALUE "ProductVersion", "11.4.0" END END BLOCK "VarFileInfo" diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -21,7 +21,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([MonetDB], [11.2.0], [i...@monetdb.org], [MonetDB]) +AC_INIT([MonetDB], [11.4.0], [i...@monetdb.org], [MonetDB]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) AC_CANONICAL_HOST diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Apr2011 copy from gdk/ChangeLog copy to gdk/ChangeLog.Apr2011 diff --git a/gdk/ChangeLog.Mar2011 b/gdk/ChangeLog.Mar2011 --- a/gdk/ChangeLog.Mar2011 +++ b/gdk/ChangeLog.Mar2011 @@ -1,3 +1,7 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog +* Tue Mar 22 2011 Fabian Groffen <fab...@cwi.nl> +- Fixed memory detection on Darwin (Mac OS X) systems not to return + bogus values + diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx --- a/gdk/gdk_bat.mx +++ b/gdk/gdk_bat.mx @@ -1640,6 +1640,7 @@ _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list