Changeset: 7bc467ab6a66 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7bc467ab6a66 Modified Files: NT/monetdb_config.h.in buildtools/conf/rules.mk configure.ag gdk/Makefile.ag gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_col.c gdk/gdk_colop.c gdk/gdk_heap.c gdk/gdk_logger.c monetdb5/extras/Makefile.ag monetdb5/extras/compiler/mal_compiler.c monetdb5/extras/crackers/Makefile.ag monetdb5/extras/crackers/crackers_updates.mx monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/blob.c monetdb5/modules/kernel/group.mx monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/Tests/fastcrack00.mal monetdb5/modules/mal/Tests/fastcrack_OneOrdered.mal monetdb5/modules/mal/Tests/fastcrack_One_00.mal monetdb5/modules/mal/Tests/fastcrack_ThreeOrdered.mal monetdb5/modules/mal/Tests/fastcrack_Three_00.mal monetdb5/modules/mal/Tests/fastcrack_Two_00.mal monetdb5/modules/mal/Tests/fastcrack_ZeroOrdered.mal monetdb5/modules/mal/Tests/fastcrack_Zero_00.mal monetdb5/modules/mal/Tests/fastcrack_copy.mal monetdb5/modules/mal/Tests/fastcrack_scan.mal monetdb5/modules/mal/Tests/fastcrack_sel_ALL.mal monetdb5/modules/mal/Tests/fastcrack_sel_EQ_mid.mal monetdb5/modules/mal/Tests/fastcrack_sel_LE_mid.mal monetdb5/modules/mal/Tests/fastcrack_sel_low_hgh.mal monetdb5/modules/mal/Tests/fastcrack_select_low_hgh.mal monetdb5/modules/mal/Tests/fastcrack_select_mid.mal monetdb5/modules/mal/Tests/fastcrack_select_void_low_hgh.mal monetdb5/modules/mal/Tests/fastcrack_select_void_mid.mal monetdb5/modules/mal/Tests/fastcrack_sort.mal monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows monetdb5/modules/mal/Tests/tstcrack.mal monetdb5/modules/mal/groupby.c monetdb5/modules/mal/mal_init.mal monetdb5/modules/mal/mat.c monetdb5/modules/mal/recycle.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet_sql.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/Tests/All monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_inline.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_octopus.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_wrapper.c monetdb5/scheduler/Makefile.ag sql/backends/monet5/sql.mx testing/Mtest.py.in Branch: headless Log Message:
Merge with default branch. diffs (truncated from 24690 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -444,3 +444,5 @@ 1833949cae477d8f1efde8caea6608c04f67ad6d Apr2011_3 c8a6189f95ae3d7cfb8d14f3b002c1077a4c437c Apr2011_SP1_release b540445f1e7aa333708963a7afb46acd1914fdb3 Aug2011_root +dbf80a87be87b463e6603221e0ed6e31d85d94c3 Apr2011_5 +bb8536db427b60b0226bbdec8dbfddfa7a26f37f Apr2011_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,13 +27,16 @@ 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/Apr2011-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Apr2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel # BuildRequires: cfitsio-devel BuildRequires: flex +%if %{?centos:0}%{!?centos:1} +# no geos library on CentOS BuildRequires: geos-devel >= 2.2.0 +%endif BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libxml2-devel @@ -263,8 +266,8 @@ %{gemdir}/doc/activerecord-monetdb-adapter-0.1/* %{gemdir}/doc/ruby-monetdb-sql-0.1/* %{gemdir}/cache/*.gem -%dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1 -%dir %{gemdir}/gems/ruby-monetdb-sql-0.1 +# %dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1 +# %dir %{gemdir}/gems/ruby-monetdb-sql-0.1 %{gemdir}/gems/activerecord-monetdb-adapter-0.1 %{gemdir}/gems/ruby-monetdb-sql-0.1 %{gemdir}/specifications/*.gemspec @@ -306,6 +309,7 @@ %{_bindir}/sqlsample.pl %{_bindir}/sqlsample.py +%if %{?centos:0}%{!?centos:1} %package geom-MonetDB5 Summary: MonetDB5 SQL GIS support module Group: Applications/Databases @@ -328,6 +332,7 @@ %{_libdir}/monetdb5/createdb/*_geom.sql %{_libdir}/monetdb5/geom.mal %{_libdir}/monetdb5/lib_geom.so +%endif %package -n MonetDB5-server Summary: MonetDB - Monet Database Management System @@ -376,7 +381,9 @@ %{_libdir}/libmonetdb5.so.* %dir %{_libdir}/monetdb5 %dir %{_libdir}/monetdb5/autoload +%if %{?centos:0}%{!?centos:1} %exclude %{_libdir}/monetdb5/geom.mal +%endif # %exclude %{_libdir}/monetdb5/rdf.mal %exclude %{_libdir}/monetdb5/sql.mal %exclude %{_libdir}/monetdb5/sql_bpm.mal @@ -385,7 +392,9 @@ %{_libdir}/monetdb5/autoload/*_vault.mal %{_libdir}/monetdb5/autoload/*_lsst.mal %{_libdir}/monetdb5/autoload/*_udf.mal +%if %{?centos:0}%{!?centos:1} %exclude %{_libdir}/monetdb5/lib_geom.so +%endif # %exclude %{_libdir}/monetdb5/lib_rdf.so %exclude %{_libdir}/monetdb5/lib_sql.so %{_libdir}/monetdb5/*.so @@ -438,7 +447,9 @@ %{_libdir}/monetdb5/lib_sql.so %{_libdir}/monetdb5/*.sql %dir %{_libdir}/monetdb5/createdb +%if %{?centos:0}%{!?centos:1} %exclude %{_libdir}/monetdb5/createdb/*_geom.sql +%endif # %exclude %{_libdir}/monetdb5/createdb/*_rdf.sql %{_libdir}/monetdb5/createdb/* %{_libdir}/monetdb5/sql*.mal @@ -538,9 +549,9 @@ --enable-fits=no \ --with-valgrind=no \ --with-mseed=no \ + --with-geos=%{?centos:no}%{!?centos:yes} %{?oid32:--enable-oid32} \ - %{?comp_cc:CC="%{comp_cc}"} \ - %{?_with_netcdf} %{?_without_netcdf} + %{?comp_cc:CC="%{comp_cc}"} make @@ -576,6 +587,59 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Wed Jul 20 2011 Sjoerd Mullender <[email protected]> - 11.3.5-20110720 +- Rebuilt. + +* Tue Jul 19 2011 Fabian Groffen <[email protected]> - 11.3.5-20110720 +- sql: Fixed regression where the superuser password could no longer be + changed, bug #2844 + +* Wed Jul 13 2011 Sjoerd Mullender <[email protected]> - 11.3.5-20110720 +- buildtools: We can now build RPMs on CentOS 6.0. Since there is no geos library + on CentOS, we do not support the geom modules there. + +* Sat Jul 9 2011 Sjoerd Mullender <[email protected]> - 11.3.5-20110720 +- gdk: Fixed a problem where appending string BATs could cause enormous growth + of the string heap. This fixes bug 2820. + +* Fri Jul 8 2011 Fabian Groffen <[email protected]> - 11.3.5-20110720 +- java: Return false from Statement.getMoreResults() instead of a + NullPointerException when no query has been performed on the Statement + yet, bug #2833 + +* Fri Jul 1 2011 Fabian Groffen <[email protected]> - 11.3.5-20110720 +- clients: Fix stethoscope's mod.fcn filter when using multiple targets, bug #2827 + +* Wed Jun 29 2011 Sjoerd Mullender <[email protected]> - 11.3.5-20110720 +- buildtools: We can now also build on Fedora 15. This required some very minor + changes. +- buildtools: Changed configure check for OpenSSL so that we can also build on CentOS + 5.6. We now no longer demand that OpenSSL is at least version 0.9.8f, + but instead we require that the hash functions we need are supported. + +* Wed Jun 29 2011 Sjoerd Mullender <[email protected]> - 11.3.5-20110720 +- clients: The separate Python distribution now uses the same version number as + the main package. + +* Wed Jun 29 2011 Sjoerd Mullender <[email protected]> - 11.3.5-20110720 +- gdk: Fixes to memory detection on FreeBSD. + +* Wed Jun 29 2011 Sjoerd Mullender <[email protected]> - 11.3.5-20110720 +- sql: Fixed incorrect insert counts. +- sql: Fixed bug 2823: MAL exeption on SQL query with subquery in the where + part. +- sql: Redirect error from create scripts back to the first client. This + fixes bug 2813. +- sql: Added joinidx based semijoin; push join through union (using + joinidx). +- sql: Fixed pushing select down. + +* Mon Jun 6 2011 Fabian Groffen <[email protected]> - 11.3.5-20110720 +- java: Fixed read-only interpretation. Connection.isReadOnly now always + returns false, setReadOnly now generates a warning when called with + true. Partly from bug #2818 +- java: Allow readonly to be set when autocommit is disabled as well. Bug #2818 + * Tue May 17 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517 - Rebuilt. 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 @@ -15,12 +15,36 @@ { "Entry" { + "MsmKey" = "8:_01F58A57152744E4B63B585C71D11F07" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_02CF5E25BEE54F778151C0945D00A00A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_03431EDC85094776AD217020CB3E26D4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_04254233029E45F19A14C08AD768A78E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_05190747250740A891E1ADC63ECE98E5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_05D32586D7A945E1B82C9FA8FEE9D43E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -33,7 +57,7 @@ } "Entry" { - "MsmKey" = "8:_078B5C45D57D4BB399500E6ED4BD4235" + "MsmKey" = "8:_0649DE636E8E4B51839FA05ED3F28173" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -45,19 +69,19 @@ } "Entry" { + "MsmKey" = "8:_07D64592E03F4084B82BEE5879CC2D5F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0805F6E64C7046AF97DC8817EC3BC77D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_08B502996EF54B4EB8CAB596962DF51A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0D3B4BD4C61849AE94E755DF092F34F0" + "MsmKey" = "8:_09106CBE3E1D4B57AA54653A4011E25A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -69,13 +93,25 @@ } "Entry" { - "MsmKey" = "8:_0E7193833B6842D5827D775A5B0413F2" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1031404DCB744EEFB91F51B19DF12D10" + "MsmKey" = "8:_1032EC592CE548D7932FCD49C957C565" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_119D4EB28D814E5593C11C64D481CC1B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_130F6E389F1B44FBB8AC1F99A12AAA2F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_13351DAE06DF4C81B9D28B5DC3D402A7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -87,37 +123,13 @@ } "Entry" { - "MsmKey" = "8:_13D007313C0C496DAC2C22C28BC00F58" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1583174A1A6E49108814CEA1DCF222D9" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_15AB1B1FC4BB48A3A8BBC9AF3E03047F" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1692D18F915A4BA787D1E1D5FCC97DD5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_16BE85BCAE3745C4AFEAB3F61F37FB2B" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
