Changeset: 116dc82f63d4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=116dc82f63d4 Modified Files: clients/perl/Cimpl/Makefile.ag clients/perl/Cimpl/MapiLib.pm.i clients/perl/Cimpl/example.pl clients/perl/MonetDB-CLI-MapiLib/Makefile.ag clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.PL clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/Makefile.ag clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/MapiLib.pm clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/README clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/00use.t clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/02cxn.t clients/perl/MonetDB-CLI-MapiLib/MonetDB/CLI/t/75mil.t clients/perl/MonetDB-CLI-MapiLib/MonetDB/Makefile.ag clients/perl/MonetDB-CLI-MapiXS/MANIFEST clients/perl/MonetDB-CLI-MapiXS/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiXS/Makefile.PL clients/perl/MonetDB-CLI-MapiXS/MapiXS.h clients/perl/MonetDB-CLI-MapiXS/MapiXS.pm clients/perl/MonetDB-CLI-MapiXS/MapiXS.xs clients/perl/MonetDB-CLI-MapiXS/README clients/perl/MonetDB-CLI-MapiXS/t/00use.t clients/perl/MonetDB-CLI-MapiXS/t/02cxn.t clients/perl/MonetDB-CLI-MapiXS/t/75mil.t clients/perl/MonetDB-CLI-MapiXS/t/85ref.t clients/perl/MonetDB-CLI-MapiXS/typemap debian/libpf-ferry0.install monetdb5/mal/mal_instruction.mx monetdb5/mal/mal_interpreter.mx monetdb5/mal/mal_type.mx monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/language.mx monetdb5/modules/mal/mal_init.mx monetdb5/modules/mal/mat.mx monetdb5/modules/mal/mdb.mx monetdb5/optimizer/Makefile.ag monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/dataflow4.mal monetdb5/optimizer/Tests/partitions00.mal monetdb5/optimizer/Tests/partitions00.stable.err monetdb5/optimizer/Tests/partitions00.stable.out monetdb5/optimizer/Tests/partitions01.mal monetdb5/optimizer/Tests/partitions01.stable.err monetdb5/optimizer/Tests/partitions01.stable.out monetdb5/optimizer/Tests/partitions02.mal monetdb5/optimizer/Tests/partitions02.stable.err monetdb5/optimizer/Tests/partitions02.stable.out monetdb5/optimizer/Tests/partitions03.mal monetdb5/optimizer/Tests/partitions03.stable.err monetdb5/optimizer/Tests/partitions03.stable.out monetdb5/optimizer/Tests/partitions04.mal monetdb5/optimizer/Tests/partitions04.stable.err monetdb5/optimizer/Tests/partitions04.stable.out monetdb5/optimizer/Tests/partitions05.mal monetdb5/optimizer/Tests/partitions05.stable.err monetdb5/optimizer/Tests/partitions05.stable.out monetdb5/optimizer/Tests/partitions06.mal monetdb5/optimizer/Tests/partitions06.stable.err monetdb5/optimizer/Tests/partitions06.stable.out monetdb5/optimizer/Tests/partitions07.mal monetdb5/optimizer/Tests/partitions07.stable.err monetdb5/optimizer/Tests/partitions07.stable.out monetdb5/optimizer/opt_dataflow.mx monetdb5/optimizer/opt_mergetable.mx monetdb5/optimizer/opt_partition.mx monetdb5/optimizer/opt_prelude.mx monetdb5/optimizer/opt_support.mx sql/backends/monet5/datacell/README sql/backends/monet5/datacell/actuator.c sql/backends/monet5/datacell/petrinet.c sql/backends/monet5/datacell/sensor.c sql/backends/monet5/sql_bpm.c sql/backends/monet5/sql_bpm.h sql/backends/monet5/sql_bpm.mal sql/storage/bpm/Makefile.ag sql/storage/bpm/bpm_distribution.c sql/storage/bpm/bpm_distribution.h sql/storage/bpm/bpm_logger.c sql/storage/bpm/bpm_logger.h sql/storage/bpm/bpm_storage.c sql/storage/bpm/bpm_storage.h sql/storage/bpm/bpm_table.c sql/storage/bpm/bpm_table.h sql/storage/m4/Makefile.ag sql/storage/m4/bpm.c sql/storage/m4/bpm.h template/ChangeLog template/ChangeLog-Archive template/ChangeLog.Apr2011 template/ChangeLog.Aug2011 template/ChangeLog.Jun2010 template/ChangeLog.Mar2011 template/ChangeLog.Oct2010 template/Makefile.ag template/README5 template/RunMapprove.in template/RunMtest.in template/bootstrap template/conf/Makefile.ag template/conf/Tests/All template/conf/Tests/monetdb-template-conds.bat template/conf/Tests/monetdb-template-conds.sh template/conf/Tests/monetdb-template-conds.stable.err template/conf/Tests/monetdb-template-conds.stable.out.32bit template/conf/Tests/monetdb-template-conds.stable.out.64bit template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit template/conf/monetdb-template-config.in template/configure.ag template/de-bootstrap template/rpm.mk.in template/src/Makefile.ag template/src/example.sql template/src/monetdb5/Makefile.ag template/src/monetdb5/Tests/All template/src/monetdb5/Tests/hello.mal template/src/monetdb5/Tests/hello.stable.err template/src/monetdb5/Tests/hello.stable.out template/src/monetdb5/example.c template/src/monetdb5/example.h template/src/monetdb5/example.mal Branch: default Log Message:
Merge with default diffs (truncated from 52790 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -444,3 +444,8 @@ 1833949cae477d8f1efde8caea6608c04f67ad6d Apr2011_3 c8a6189f95ae3d7cfb8d14f3b002c1077a4c437c Apr2011_SP1_release b540445f1e7aa333708963a7afb46acd1914fdb3 Aug2011_root +dbf80a87be87b463e6603221e0ed6e31d85d94c3 Apr2011_5 +bb8536db427b60b0226bbdec8dbfddfa7a26f37f Apr2011_SP2_release +0fd8df3e7fc2f320fe7638af8e4883bf433ef61b Apr2011_7 +bb8536db427b60b0226bbdec8dbfddfa7a26f37f Apr2011_SP2_release +a155d5445790c798ddf7a3e1b54094c13e1b3eaa Apr2011_SP2_release diff --git a/COPYING b/COPYING --- a/COPYING +++ b/COPYING @@ -434,7 +434,7 @@ "The contents of this file are subject to the MonetDB Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +http://www.monetdb.org/Legal/MonetDBLicense Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/HowToStart.rst b/HowToStart.rst --- a/HowToStart.rst +++ b/HowToStart.rst @@ -93,7 +93,6 @@ configuration and if they are missing, the feature is just missing: - - swig - perl - php diff --git a/Makefile.ag b/Makefile.ag --- a/Makefile.ag +++ b/Makefile.ag @@ -1,7 +1,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the @@ -27,4 +27,4 @@ EXTRA_DIST = bootstrap configure configure.ac configure.ag libversions \ MonetDB.spec rpm.mk.in COPYING README license.txt HowToStart.rst -EXTRA_DIST_DIR = NT debian template +EXTRA_DIST_DIR = NT debian diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -25,9 +25,9 @@ Vendor: MonetDB BV <i...@monetdb.org> 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 +License: MPL - http://www.monetdb.org/Legal/MonetDBLicense +URL: http://www.monetdb.org/ +Source: http://dev.monetdb.org/downloads/sources/Apr2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -43,13 +43,11 @@ BuildRequires: openssl-devel BuildRequires: pcre-devel >= 4.5 BuildRequires: perl -BuildRequires: perl-devel BuildRequires: python # BuildRequires: raptor-devel >= 1.4.16 BuildRequires: readline-devel BuildRequires: ruby BuildRequires: rubygems -BuildRequires: swig BuildRequires: unixODBC-devel BuildRequires: zlib-devel @@ -241,8 +239,6 @@ %files client-perl %defattr(-,root,root) %{_prefix}/%{perl_libdir}/* -%dir %{_datadir}/monetdb/perl -%{_datadir}/monetdb/perl/* %package client-ruby Summary: MonetDB ruby interface @@ -386,7 +382,6 @@ %endif # %exclude %{_libdir}/monetdb5/rdf.mal %exclude %{_libdir}/monetdb5/sql.mal -%exclude %{_libdir}/monetdb5/sql_bpm.mal %{_libdir}/monetdb5/*.mal # %{_libdir}/monetdb5/autoload/*_fits.mal %{_libdir}/monetdb5/autoload/*_vault.mal @@ -538,21 +533,44 @@ %build %{configure} \ - --enable-strict=no \ --enable-assert=no \ + --enable-bits=%{bits} \ + --enable-console=yes \ + --enable-crackers=no \ + --enable-datacell=no \ --enable-debug=no \ - --enable-optimize=yes \ - --enable-bits=%{bits} \ + --enable-developer=no \ + --enable-fits=no \ + --enable-gdk=yes \ + --enable-geom=%{?centos:no}%{!?centos:yes} \ + --enable-instrument=no \ --enable-jdbc=no \ --enable-merocontrol=no \ + --enable-monetdb5=yes \ + --enable-noexpand=no \ + --enable-odbc=yes \ + --enable-oid32=%{?oid32:yes}%{!?oid32:no} \ + --enable-optimize=yes \ + --enable-profile=no \ --enable-rdf=no \ - --enable-fits=no \ + --enable-sql=yes \ + --enable-strict=no \ + --enable-testing=yes \ + --with-ant=no \ + --with-bz2=yes \ + --with-geos=%{?centos:no}%{!?centos:yes} \ + --with-hwcounters=no \ + --with-java=no \ + --with-mseed=no \ + --with-perl=yes \ + --with-pthread=yes \ + --with-python=yes \ + --with-readline=yes \ + --with-rubygem=yes \ + --with-sphinxclient=no \ + --with-unixodbc=yes \ --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 @@ -588,6 +606,62 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Tue Jul 26 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.7-20110726 +- Rebuilt. + +* Wed Jul 20 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720 +- Rebuilt. + +* Tue Jul 19 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720 +- sql: Fixed regression where the superuser password could no longer be + changed, bug #2844 + +* Wed Jul 13 2011 Sjoerd Mullender <sjo...@acm.org> - 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 <sjo...@acm.org> - 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 <fab...@cwi.nl> - 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 <fab...@cwi.nl> - 11.3.5-20110720 +- clients: Fix stethoscope's mod.fcn filter when using multiple targets, bug #2827 + +* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 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 <sjo...@acm.org> - 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 <sjo...@acm.org> - 11.3.5-20110720 +- gdk: Fixes to memory detection on FreeBSD. + +* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 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 <fab...@cwi.nl> - 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 <sjo...@acm.org> - 11.3.3-20110517 - Rebuilt. diff --git a/NT/Makefile b/NT/Makefile --- a/NT/Makefile +++ b/NT/Makefile @@ -3,7 +3,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the 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 @@ -576,13 +576,13 @@ "ProductVersion" = "8:11.6.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; + "ARPHELPLINK" = "8:http://www.monetdb.org/"; "Title" = "8:MonetDB ODBC Driver" "Subject" = "8:" "ARPCONTACT" = "8:MonetDB BV" "Keywords" = "8:MonetDB SQL ODBC" "ARPCOMMENTS" = "8:MonetDB ODBC Driver" - "ARPURLINFOABOUT" = "8:http://monetdb.cwi.nl"; + "ARPURLINFOABOUT" = "8:http://www.monetdb.org"; "ARPPRODUCTICON" = "8:_14F4BC1A7F54458D91CFA4A0BD174604" "ARPIconIndex" = "3:0" "SearchPath" = "8:" 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 @@ -402,7 +402,7 @@ "Name" = "8:Installation" "Condition" = "8:INSTALLPATH" "Message" = "8:MonetDB5-SQL needs to be installed first." - "InstallUrl" = "8:http://monetdb.cwi.nl/"; + "InstallUrl" = "8:http://www.monetdb.org/"; } } "Locator" @@ -435,13 +435,13 @@ "ProductVersion" = "8:11.6.0" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; + "ARPHELPLINK" = "8:http://www.monetdb.org/"; "Title" = "8:MonetDB5/SQL/GIS" "Subject" = "8:" "ARPCONTACT" = "8:MonetDB BV" "Keywords" = "8:MonetDB5 MonetDB SQL GIS Database" "ARPCOMMENTS" = "8:MonetDB5/SQL/GIS Module" - "ARPURLINFOABOUT" = "8:http://monetdb.cwi.nl"; + "ARPURLINFOABOUT" = "8:http://www.monetdb.org"; "ARPPRODUCTICON" = "8:_0F19ACCC44674803BA72C7FE1408CD70" "ARPIconIndex" = "3:0" "SearchPath" = "8:" 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" _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
