Changeset: e80c36dd7e58 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e80c36dd7e58 Modified Files: debian/monetdb5-server.manpages sql/backends/monet5/Makefile.ag Branch: sciql Log Message:
Merge with default branch. diffs (truncated from 3329 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -438,3 +438,6 @@ 8a1a1b65992cd98423eee70cef0986beb3b7360d Apr2011_root e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1 be8ff3e8c6150ec40f4e0d1ba9789bec23621f88 Mar2011_1 +568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1 +568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1 +ff43c1f6f50cf795cf12b9336f74fd86686a5fd6 Apr2011_1 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://dev.monetdb.org/downloads/sources/Mar2011/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Apr2011/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -384,6 +384,8 @@ %{_libdir}/monetdb5/*.mal # %{_libdir}/monetdb5/autoload/*_fits.mal %{_libdir}/monetdb5/autoload/*_vault.mal +%{_libdir}/monetdb5/autoload/*_lsst.mal +%{_libdir}/monetdb5/autoload/*_udf.mal %exclude %{_libdir}/monetdb5/lib_geom.so # %exclude %{_libdir}/monetdb5/lib_rdf.so %exclude %{_libdir}/monetdb5/lib_sql.so @@ -574,6 +576,68 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Thu Apr 21 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110421 +- Rebuilt. + +* Mon Apr 18 2011 Fabian Groffen <[email protected]> - 11.3.1-20110421 +- merovingian: Fix monetdb return code upon failure to start/stop a database + +* Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 +- Rebuilt. + +* Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 +- gdk: Fixed bugs in antiselect which gave the incorrect result when upper + and lower bount were equal. This bug could be triggered by the SQL + query SELECT * FROM t WHERE x NOT BETWEEN y AND y. + +* Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 +- sql: Some names in the SQL catalog were changed. This means that the + database in the Apr2011 release is not compatible with pre-Apr2011 + databases. The database is converted automatically when opened the + first time. This database can then no longer be read by an older + release. + +* Tue Apr 5 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 +- clients: Plugged a small memory leak occurring upon redirects by the server + (e.g. via monetdbd) + +* Tue Apr 5 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 +- java: clarify exception messages for unsupported methods + +* Thu Mar 24 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 +- merovingian: The forward property for databases has been removed. Instead, only + a global proxy or redirect mode can be set using monetdbd. + +* Thu Mar 24 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 +- merovingian: monetdbd can no longer log error and normal messages to separate + logfiles, logging to stdout and stderr is no longer possible either. +- merovingian: The .merovingian_pass file is no longer in use, and replaced by the + .merovingian_properties file. Use monetdbd (get|set) passphrase to + view/edit the control passphrase. Existing .merovingian_pass files + will automatically be migrated upon startup of monetdbd. +- merovingian: monetdbd now understands commands that allow to create, start, stop, + get and set properties on a given dbfarm. This behaviour is intended + as primary way to start a MonetDB Database Server, on a given location + of choice. monetdbd get and set are the replacement of editing the + monetdb5.conf file (which is no longer in use as of the Apr2011 + release). See monetdbd(1). + +* Thu Mar 24 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 +- clients: Remove XQuery related code from Ruby adapter, PHP driver and Perl Mapi + library + +* Thu Mar 24 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 +- java: Removed XQuery related XRPC wrapper and XML:DB code, removed support + for language=xquery and language=mil from JDBC. + +* Thu Mar 24 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 +- clients: Make SQL the default language for mclient, e.g. to use when --language= + or -l is omitted + +* Thu Mar 24 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 +- monetdb5: mserver5 no longer reads monetdb5.conf upon startup by default. + Use --config=file to have mserver5 read a configuration on startup + * Thu Mar 24 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110324 - Rebuilt. diff --git a/NT/installer32/MonetDB-ODBC-Driver.sln b/NT/installer32/MonetDB-ODBC-Driver.sln --- a/NT/installer32/MonetDB-ODBC-Driver.sln +++ b/NT/installer32/MonetDB-ODBC-Driver.sln @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MonetDB-ODBC-Installer", "MonetDB-ODBC-Installer.vdproj", "{33AE0CC1-169E-4168-978A-0CDDD1E6A51A}" EndProject Global 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 @@ -230,7 +230,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5" { - "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll" + "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\bin\\iconv.dll" "TargetName" = "8:iconv.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -250,7 +250,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A" { - "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll" + "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.5.win32-vs10\\bin\\libbz2.dll" "TargetName" = "8:libbz2.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -290,7 +290,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D" { - "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll" + "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\bin\\zlib1.dll" "TargetName" = "8:zlib1.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -330,7 +330,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_84999A6BF369454381F5ACB44DAAD420" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -370,7 +370,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4FE8AF57D0147A5926576F3D73B9B3B" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -1206,7 +1206,7 @@ { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\Microsoft_VC90_CRT_x86.msm" + "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\Microsoft_VC100_CRT_x86.msm" "Properties" { } diff --git a/NT/installer32/MonetDB5-Geom-Module.sln b/NT/installer32/MonetDB5-Geom-Module.sln --- a/NT/installer32/MonetDB5-Geom-Module.sln +++ b/NT/installer32/MonetDB5-Geom-Module.sln @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MonetDB5-Geom-Module", "MonetDB5-Geom-Module.vdproj", "{E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}" EndProject Global 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 @@ -231,7 +231,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268" { - "SourcePath" = "8:C:\\Libraries\\geos-3.2.2.win32\\bin\\geos_c.dll" + "SourcePath" = "8:C:\\Libraries\\geos-3.2.2.win32-vs10\\bin\\geos_c.dll" "TargetName" = "8:geos_c.dll" "Tag" = "8:" "Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E" @@ -992,7 +992,7 @@ { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\Microsoft_VC90_CRT_x86.msm" + "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\Microsoft_VC100_CRT_x86.msm" "Properties" { } diff --git a/NT/installer32/MonetDB5-SQL-Installer.sln b/NT/installer32/MonetDB5-SQL-Installer.sln --- a/NT/installer32/MonetDB5-SQL-Installer.sln +++ b/NT/installer32/MonetDB5-SQL-Installer.sln @@ -1,5 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MonetDB5-SQL-Installer", "MonetDB5-SQL-Installer.vdproj", "{E5EBAB1B-6991-4ACC-8DBD-36E77E3D7F45}" EndProject Global 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 @@ -1219,7 +1219,7 @@ { "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4" { - "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib" + "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\lib\\zdll.lib" "TargetName" = "8:zdll.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1259,7 +1259,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0607DD25BFA34B92B0BF84584D3D8BCA" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.0a.win32\\lib\\libeay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\lib\\libeay32.lib" "TargetName" = "8:libeay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1379,7 +1379,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3" { - "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll" + "SourcePath" = "8:C:\\Libraries\\bzip2-1.0.5.win32-vs10\\bin\\libbz2.dll" "TargetName" = "8:libbz2.dll" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1439,7 +1439,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F" { - "SourcePath" = "8:C:\\Libraries\\libxml2-2.7.7.win32\\lib\\libxml2.dll" + "SourcePath" = "8:C:\\Libraries\\libxml2-2.7.7.win32-vs10\\lib\\libxml2.dll" "TargetName" = "8:libxml2.dll" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1599,7 +1599,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1AF238588D2D4EA5A416D48291406811" { - "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32\\lib\\iconv.lib" + "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\lib\\iconv.lib" "TargetName" = "8:iconv.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1799,7 +1799,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2C7B5DF9CBE642149692C67FC052ECA4" { - "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll" + "SourcePath" = "8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\bin\\iconv.dll" "TargetName" = "8:iconv.dll" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -1839,7 +1839,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F" { - "SourcePath" = "8:C:\\Libraries\\libxml2-2.7.7.win32\\lib\\libxml2.lib" + "SourcePath" = "8:C:\\Libraries\\libxml2-2.7.7.win32-vs10\\lib\\libxml2.lib" "TargetName" = "8:libxml2.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -2399,7 +2399,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27" { - "SourcePath" = "8:C:\\Program Files\\PCRE\\bin\\pcre.dll" + "SourcePath" = "8:C:\\Program Files\\PCRE-vs10\\bin\\pcre.dll" "TargetName" = "8:pcre.dll" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -3239,7 +3239,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_88661B3BC7724CF992AC6079E040DE3A" { - "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll" + "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\bin\\zlib1.dll" "TargetName" = "8:zlib1.dll" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -3359,7 +3359,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_929EE4AE7E524A1CBC69C7718D412876" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll" _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
