Changeset: 1db157d67d26 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1db157d67d26 Added Files: clients/examples/perl/Makefile.ag clients/examples/perl/client.pl clients/examples/perl/countries.sql clients/examples/perl/dbitest_extensive.pl clients/examples/perl/dbitest_small.pl clients/examples/perl/malsample.pl clients/examples/perl/smack00.pl clients/examples/perl/smack01.pl clients/examples/perl/sqlsample.pl sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.sql sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.err sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.sql sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.err sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.out sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.sql sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.err sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.out sql/test/Tests/bincopycollist-prepare.bat sql/test/Tests/bincopycollist-prepare.sh sql/test/Tests/bincopycollist-prepare.stable.err sql/test/Tests/bincopycollist-prepare.stable.out sql/test/Tests/bincopycollist.reqtests sql/test/Tests/bincopycollist.sql.in sql/test/Tests/bincopycollist.stable.err sql/test/Tests/bincopycollist.stable.out sql/test/Tests/bincopyint.bin Removed Files: clients/perl/DBD/MANIFEST clients/perl/DBD/MANIFEST.SKIP clients/perl/DBD/Makefile.PL clients/perl/DBD/Makefile.ag clients/perl/DBD/README clients/perl/DBD/monetdb.pm clients/perl/DBD/monetdb/GetInfo.pm clients/perl/DBD/monetdb/Makefile.ag clients/perl/DBD/monetdb/TypeInfo.pm clients/perl/DBD/t/01base.t clients/perl/DBD/t/02ads.t clients/perl/DBD/t/02cxn.t clients/perl/DBD/t/05gi.t clients/perl/DBD/t/06ti.t clients/perl/DBD/t/07q.t clients/perl/DBD/t/11prep.t clients/perl/DBD/t/12bind.t clients/perl/DBD/t/12ins_b.t clients/perl/DBD/t/12ins_q.t clients/perl/DBD/t/13count.t clients/perl/DBD/t/14rows.t clients/perl/DBD/t/18bc.t clients/perl/DBD/t/21sth.t clients/perl/DBD/t/23null.t clients/perl/DBD/t/31txn.t clients/perl/DBD/t/41ddtbl.t clients/perl/DBD/t/42ddcol.t clients/perl/DBD/t/43ddpk.t clients/perl/DBD/t/44ddfk.t clients/perl/DBD/t/51qi.t clients/perl/DBD/t/75mil.t clients/perl/DBD/t/DBD_TEST.pm clients/perl/Makefile.ag clients/perl/Mapi.pm clients/perl/MonetDB-CLI-MapiPP/Makefile.ag clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.PL clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.ag clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/00use.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/02cxn.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/75mil.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/Makefile.ag clients/perl/MonetDB-CLI/Makefile.ag clients/perl/MonetDB-CLI/MonetDB/CLI.pm clients/perl/MonetDB-CLI/MonetDB/MANIFEST clients/perl/MonetDB-CLI/MonetDB/MANIFEST.SKIP clients/perl/MonetDB-CLI/MonetDB/Makefile.PL clients/perl/MonetDB-CLI/MonetDB/Makefile.ag clients/perl/MonetDB-CLI/MonetDB/README clients/perl/MonetDB-CLI/MonetDB/t/00use.t clients/perl/MonetDB-CLI/MonetDB/t/02cxn.t clients/perl/MonetDB-CLI/MonetDB/t/75mil.t clients/perl/Tests/Makefile.ag clients/perl/Tests/client.pl clients/perl/Tests/countries.sql clients/perl/Tests/dbitest_extensive.pl clients/perl/Tests/dbitest_small.pl clients/perl/Tests/malsample.pl.in clients/perl/Tests/smack00.pl clients/perl/Tests/smack01.pl clients/perl/Tests/sqlsample.pl.in clients/perl/mclient.pl clients/php/INSTALL clients/php/Makefile.ag clients/php/README clients/php/TODO clients/php/doc/generate_doc.sh clients/php/examples/query.php clients/php/examples/simple_query.php clients/php/lib/Makefile.ag clients/php/lib/php_mapi.inc clients/php/lib/php_monetdb.php debian/perl-monetdb-client.install debian/php5-monetdb-client.install 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/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst clients/Makefile.ag clients/examples/Makefile.ag clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog debian/control gdk/ChangeLog gdk/gdk_batop.c gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_project.c gdk/gdk_system.h gdk/gdk_value.c gdk/libbat.rc java/ChangeLog java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java java/tests/Test_PSgeneratedkeys.java libversions monetdb5/mal/mal_builder.c monetdb5/mal/mal_factory.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/modules/mal/tablet.c monetdb5/scheduler/run_memo.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql.c sql/backends/monet5/sql_execute.c sql/backends/monet5/vaults/lidar/lidar.c sql/server/rel_updates.c sql/server/sql_parser.y sql/test/BugTracker-2016/Tests/All sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.bat sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.sh sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Tests/All testing/Mtest.py.in tools/merovingian/daemon/forkmserver.c vertoo.data Branch: batcalc-candidates Log Message:
Merge with default branch. diffs (truncated from 9651 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -632,3 +632,5 @@ 4a05df3932a97865ac7e4037361723d5563490b3 c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_7 4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_SP1_release c8b06c670a635978640d742643c317b82c5f4b8c Jun2016_SP1_release +731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_9 +731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -114,7 +114,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jun2016-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jun2016-SP2/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -146,7 +146,6 @@ BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: openssl-devel BuildRequires: pcre-devel >= 4.5 -BuildRequires: perl BuildRequires: python-devel BuildRequires: readline-devel BuildRequires: unixODBC-devel @@ -356,60 +355,14 @@ fi %{_libdir}/libMonetODBC.so %{_libdir}/libMonetODBCs.so -%package client-php -Summary: MonetDB php interface -Group: Applications/Databases -Requires: php -BuildArch: noarch - -%description client-php -MonetDB is a database management system that is developed from a -main-memory perspective with use of a fully decomposed storage model, -automatic index management, extensibility of data types and search -accelerators. It also has an SQL frontend. - -This package contains the files needed to use MonetDB from a PHP -program. - -%files client-php -%defattr(-,root,root) -%dir %{_datadir}/php/monetdb -%{_datadir}/php/monetdb/* - -%package client-perl -Summary: MonetDB perl interface -Group: Applications/Databases -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(DBI) -Requires: perl(Digest::SHA) -Requires: perl(Digest::MD5) -# when not using BuildArch: noarch, globally replace perl_vendorlib by -# perl_vendorarch -BuildArch: noarch -%{?perl_default_filter} -%global __requires_exclude perl\\(DBD::monetdb|perl\\(MonetDB::|perl\\(Mapi\\) - -%description client-perl -MonetDB is a database management system that is developed from a -main-memory perspective with use of a fully decomposed storage model, -automatic index management, extensibility of data types and search -accelerators. It also has an SQL frontend. - -This package contains the files needed to use MonetDB from a Perl -program. - -%files client-perl -%defattr(-,root,root) -%{perl_vendorlib}/* - %package client-tests Summary: MonetDB Client tests package Group: Applications/Databases Requires: MonetDB5-server%{?_isa} = %{version}-%{release} Requires: %{name}-client%{?_isa} = %{version}-%{release} Requires: %{name}-client-odbc%{?_isa} = %{version}-%{release} -Requires: %{name}-client-perl = %{version}-%{release} -Requires: %{name}-client-php = %{version}-%{release} +Recommends: perl-DBD-monetdb >= 1.0 +Recommends: php-monetdb >= 1.0 Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release} Requires: python-monetdb >= 1.0 @@ -917,8 +870,6 @@ developer, but if you do want to test, t --with-libxml2=yes \ --with-lzma=yes \ --with-openssl=yes \ - --with-perl=yes \ - --with-perl-libdir=lib/perl5 \ --with-proj=no \ --with-pthread=yes \ --with-python=yes \ @@ -939,10 +890,6 @@ mkdir -p %{buildroot}%{_localstatedir}/M mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm mkdir -p %{buildroot}%{_localstatedir}/log/monetdb mkdir -p %{buildroot}%{_localstatedir}/run/monetdb -mkdir -p %{buildroot}%{perl_vendorlib} -if [ ! %{buildroot}%{_prefix}/lib/perl5 -ef %{buildroot}%{perl_vendorlib} ]; then - mv %{buildroot}%{_prefix}/lib/perl5/* %{buildroot}%{perl_vendorlib} -fi # remove unwanted stuff # .la files @@ -956,6 +903,23 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Mon Sep 19 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.9-20160919 +- Rebuilt. +- BZ#3939: Assert failure on concurrent queries when querying sys.queue +- BZ#4019: Casting a timestamp from a string results in NULL +- BZ#4025: expressions in the WHERE clause that evaluates incorrectly +- BZ#4038: After upgrade from 11.21.19, jdbc couldn't list tables for + non sys users +- BZ#4044: Server crash when trying to delete a table has been added to + a merge table with "cascade" at the end +- BZ#4049: Wrong results for queries with "OR" and "LEFT JOIN" +- BZ#4052: Infinite loop in rel_select +- BZ#4054: copy into file wrongly exports functions +- BZ#4059: Geom functions only visible by user monetdb +- BZ#4060: BAT leak in some aggregate queries +- BZ#4062: Error: SELECT: no such binary operator 'like(varchar,varchar)' + when used in query running in other schema than sys + * Wed Jul 13 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.7-20160713 - Rebuilt. - BZ#4014: KILL signal diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -85,10 +85,6 @@ PYTHON3LIB=python32.lib !ENDIF PYTHON3_LIBDIR=share\MonetDB\python3 -!IFDEF HAVE_PERL -PERL_LIBDIR = share\MonetDB\perl -!ENDIF - !IFDEF HAVE_PCRE # This is the location of the PCRE library !IFNDEF LIBPCRE @@ -400,11 +396,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_PCRE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_PERL - $(ECHO) HAVE_PERL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_PERL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_PROJ $(ECHO) HAVE_PROJ_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -474,7 +465,6 @@ CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \ "LIBXML2=$(LIBXML2)" \ "LIBZLIB=$(LIBZLIB)" \ "PACKAGE=$(pkg)" \ - "PERL_LIBDIR=$(PERL_LIBDIR)" \ "PYTHON=$(PYTHON)" \ "PYTHON2=$(PYTHON2)" \ "PYTHON2_LIBDIR=$(PYTHON2_LIBDIR)" \ diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst --- a/buildtools/doc/HowToRelease.rst +++ b/buildtools/doc/HowToRelease.rst @@ -118,11 +118,11 @@ Releasing Use these ``nmake`` options for a 32 bit compile: ``NDEBUG=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PCRE=1 - HAVE_MONETDB5=1 HAVE_PERL=1`` + HAVE_MONETDB5=1`` Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1 - HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PCRE=1 - HAVE_PERL=1`` + HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 + HAVE_PCRE=1`` - Create PGP signatures and SHA1 checksums:: diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst +++ b/buildtools/doc/windowsbuild.rst @@ -893,7 +893,6 @@ possible: - ``HAVE_PYTHON=1`` - include the Python component; - ``HAVE_ICONV=1`` - the iconv library is available; - ``HAVE_OPENSSL=1`` - the OpenSSL library is available; -- ``HAVE_PERL=1`` - include the Perl component. In addition, you can add a parameter which points to a file with extra definitions for ``nmake``. This is very convenient to define where @@ -912,8 +911,7 @@ The contents of the file referred to wit parameter may contain something like:: bits=32 - LIBPERL=C:\Perl - LIBPCRE=C:\Program Files\PCRE + LIBPCRE=C:\Program Files\PCRE LIBICONV=C:\Libraries\iconv-1.11.win32 LIBZLIB=C:\Libraries\zlib-1.2.8.win32 LIBXML2=C:\Libraries\libxml2-2.9.2.win32 diff --git a/clients/Makefile.ag b/clients/Makefile.ag --- a/clients/Makefile.ag +++ b/clients/Makefile.ag @@ -4,6 +4,6 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. -SUBDIRS = HAVE_MAPI?mapilib HAVE_MAPI?mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php examples NATIVE_WIN32?NT +SUBDIRS = HAVE_MAPI?mapilib HAVE_MAPI?mapiclient HAVE_ODBC?odbc examples NATIVE_WIN32?NT EXTRA_DIST_DIR = Tests ruby R diff --git a/clients/examples/Makefile.ag b/clients/examples/Makefile.ag --- a/clients/examples/Makefile.ag +++ b/clients/examples/Makefile.ag @@ -4,6 +4,6 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. -SUBDIRS = C php +SUBDIRS = C php perl EXTRA_DIST_DIR = python diff --git a/clients/perl/Tests/Makefile.ag b/clients/examples/perl/Makefile.ag rename from clients/perl/Tests/Makefile.ag rename to clients/examples/perl/Makefile.ag --- a/clients/perl/Tests/Makefile.ag +++ b/clients/examples/perl/Makefile.ag @@ -9,8 +9,7 @@ MTSAFE scripts_pl = { COND = HAVE_TESTING DIR = bindir - SOURCES = sqlsample.pl.in malsample.pl.in + SOURCES = sqlsample.pl malsample.pl } EXTRA_DIST = client.pl smack00.pl smack01.pl - diff --git a/clients/perl/Tests/client.pl b/clients/examples/perl/client.pl rename from clients/perl/Tests/client.pl rename to clients/examples/perl/client.pl diff --git a/clients/perl/Tests/countries.sql b/clients/examples/perl/countries.sql rename from clients/perl/Tests/countries.sql rename to clients/examples/perl/countries.sql diff --git a/clients/perl/Tests/dbitest_extensive.pl b/clients/examples/perl/dbitest_extensive.pl rename from clients/perl/Tests/dbitest_extensive.pl rename to clients/examples/perl/dbitest_extensive.pl diff --git a/clients/perl/Tests/dbitest_small.pl b/clients/examples/perl/dbitest_small.pl rename from clients/perl/Tests/dbitest_small.pl rename to clients/examples/perl/dbitest_small.pl diff --git a/clients/perl/Tests/malsample.pl.in b/clients/examples/perl/malsample.pl rename from clients/perl/Tests/malsample.pl.in rename to clients/examples/perl/malsample.pl --- a/clients/perl/Tests/malsample.pl.in +++ b/clients/examples/perl/malsample.pl @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/env perl # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/clients/perl/Tests/smack00.pl b/clients/examples/perl/smack00.pl rename from clients/perl/Tests/smack00.pl rename to clients/examples/perl/smack00.pl diff --git a/clients/perl/Tests/smack01.pl b/clients/examples/perl/smack01.pl rename from clients/perl/Tests/smack01.pl rename to clients/examples/perl/smack01.pl diff --git a/clients/perl/Tests/sqlsample.pl.in b/clients/examples/perl/sqlsample.pl rename from clients/perl/Tests/sqlsample.pl.in rename to clients/examples/perl/sqlsample.pl --- a/clients/perl/Tests/sqlsample.pl.in +++ b/clients/examples/perl/sqlsample.pl @@ -1,4 +1,4 @@ -#!@PERL@ +#!/usr/bin/env perl # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/clients/perl/DBD/MANIFEST b/clients/perl/DBD/MANIFEST deleted file mode 100644 --- a/clients/perl/DBD/MANIFEST +++ /dev/null @@ -1,31 +0,0 @@ -Changes -MANIFEST -MANIFEST.SKIP -Makefile.PL -README -monetdb.pm -monetdb/GetInfo.pm -monetdb/TypeInfo.pm -t/01base.t _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
