Changeset: 5713bbd5ee8f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5713bbd5ee8f Added Files: sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.sql sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.err sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.out sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql Removed Files: buildtools/autogen/setup.py Modified Files: .hgtags ChangeLog-Archive ChangeLog.Aug2018 MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/ChangeLog clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/gdk_logger.c gdk/gdk_logger.h gdk/libbat.rc libversions monetdb5/tools/libmonetdb5.rc rpm.mk.in sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows sql/test/BugTracker-2018/Tests/All testing/Mtest.py.in testing/listexports.py.in vertoo.data Branch: client-filetrans Log Message:
Merge with default branch. diffs (truncated from 1265 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -714,3 +714,6 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9 a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11 +a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Oct 10 2018 Sjoerd Mullender <[email protected]> - 11.31.11-20181011 +- Some subtle dependencies between RPMs have been fixed. + * Wed Feb 14 2018 Stefan Manegold <[email protected]> - 11.29.1-20180315 - mclient's execution time profiling options and output format have been changed. Instead of implicitly via the "--interactive"/"-i" diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,2 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Wed Oct 10 2018 Sjoerd Mullender <[email protected]> diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -14,6 +14,10 @@ %global release %{buildno}%{?dist} +# This package contains monetdbd which is a (long running) daemon, so +# we need to harden: +%global _hardened_build 1 + # On RedHat Enterprise Linux and derivatives, if the Extra Packages # for Enterprise Linux (EPEL) repository is available, you can enable # its use by providing rpmbuild or mock with the "--with epel" option. @@ -739,10 +743,6 @@ used from the MAL level. Summary: MonetDB5 SQL server modules Group: Applications/Databases Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release} -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -# RHEL >= 7, and all current Fedora -Requires(post): %{_bindir}/systemd-tmpfiles -%endif %if (0%{?fedora} >= 22) %if %{with hugeint} Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release} @@ -759,11 +759,6 @@ accelerators. It also has an SQL fronte This package contains the SQL frontend for MonetDB. If you want to use SQL with MonetDB, you will need to install this package. -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 -%post SQL-server5 -systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/monetdbd.conf -%endif - %files SQL-server5 %defattr(-,root,root) %{_bindir}/monetdb @@ -771,7 +766,8 @@ systemd-tmpfiles --create %{_sysconfdir} %dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # RHEL >= 7, and all current Fedora -%{_sysconfdir}/tmpfiles.d/monetdbd.conf +%dir %attr(775,monetdb,monetdb) /run/monetdb +%{_tmpfilesdir}/monetdbd.conf %{_unitdir}/monetdbd.service %else # RedHat Enterprise Linux < 7 @@ -882,10 +878,10 @@ Group: Applications/Databases %if "%{?_selinux_policy_version}" != "" Requires: selinux-policy >= %{?_selinux_policy_version} %endif -Requires(post): MonetDB5-server = %{version}-%{release} -Requires(postun): MonetDB5-server -Requires(post): %{name}-SQL-server5 = %{version}-%{release} -Requires(postun): %{name}-SQL-server5 +Requires(post): MonetDB5-server%{?_isa} = %{version}-%{release} +Requires(postun): MonetDB5-server%{?_isa} = %{version}-%{release} +Requires(post): %{name}-SQL-server5%{?_isa} = %{version}-%{release} +Requires(postun): %{name}-SQL-server5%{?_isa} = %{version}-%{release} Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles BuildArch: noarch @@ -908,6 +904,8 @@ do /usr/sbin/semodule -s ${selinuxvariant} -i \ %{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || : done +# use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, +# %{_localstatedir}/run is a symlink to /run /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : /usr/bin/systemctl try-restart monetdbd.service @@ -921,6 +919,8 @@ if [ $1 -eq 0 ] ; then do /usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || : done + # use %{_localstatedir}/run/monetdb here for EPEL 6; on other systems, + # %{_localstatedir}/run is a symlink to /run /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : if [ $active = active ]; then /usr/bin/systemctl start monetdbd.service @@ -943,11 +943,18 @@ fi # that causes it to report an internal error when compiling # testing/difflib.c. The work around is to not use -fstack-protector-strong. # The bug exhibits itself on CentOS 7 on AArch64. -if [ `gcc -v 2>&1 | grep -c 'Target: aarch64\|gcc version 4\.'` -eq 2 ]; then - # set CFLAGS before configure, so that this value gets used - CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -grecord-gcc-switches ' - export CFLAGS -fi +# Everywhere else, add -Wno-format-truncation to the compiler options +# to reduce the number of warnings during compilation. +%ifarch aarch64 + if gcc -v 2>&1 | grep -q 'gcc version 4\.'; then + CFLAGS="${CFLAGS:-$(echo %optflags | sed 's/-fstack-protector-strong//')" + else + CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" + fi +%else + CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}" +%endif +export CFLAGS %{configure} \ --enable-assert=no \ --enable-console=yes \ @@ -1017,10 +1024,23 @@ cd - %install %make_install -mkdir -p %{buildroot}%{_localstatedir}/MonetDB -mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm -mkdir -p %{buildroot}%{_localstatedir}/log/monetdb -mkdir -p %{buildroot}%{_localstatedir}/run/monetdb +# move file to correct location +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +mkdir -p %{buildroot}%{_tmpfilesdir} +mv %{buildroot}%{_sysconfdir}/tmpfiles.d/monetdbd.conf %{buildroot}%{_tmpfilesdir} +rmdir %{buildroot}%{_sysconfdir}/tmpfiles.d +%endif + +install -d -m 0750 %{buildroot}%{_localstatedir}/MonetDB +install -d -m 0770 %{buildroot}%{_localstatedir}/monetdb5/dbfarm +install -d -m 0775 %{buildroot}%{_localstatedir}/log/monetdb +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +# RHEL >= 7, and all current Fedora +install -d -m 0775 %{buildroot}/run/monetdb +%else +# RedHat Enterprise Linux < 7 +install -d -m 0775 %{buildroot}%{_localstatedir}/run/monetdb +%endif # remove unwanted stuff # .la files @@ -1042,6 +1062,14 @@ done %postun -p /sbin/ldconfig %changelog +* Thu Oct 11 2018 Sjoerd Mullender <[email protected]> - 11.31.11-20181011 +- Rebuilt. +- BZ#6648: key property potentially wrong after type conversion +- BZ#6649: Projection inside within transaction gives wrong results + +* Wed Oct 10 2018 Sjoerd Mullender <[email protected]> - 11.31.11-20181011 +- MonetDB: Some subtle dependencies between RPMs have been fixed. + * Fri Oct 05 2018 Sjoerd Mullender <[email protected]> - 11.31.9-20181005 - Rebuilt. - BZ#6640: timestamp_to_str returning incorrectly adjusted results diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py deleted file mode 100755 --- a/buildtools/autogen/setup.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -# 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 -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. - -from distutils.core import setup - -setup(name = "autogen", - version = "1.0", - description = "MonetDB autogen script", - author = "MonetDB Team, CWI", - author_email = "[email protected]", - url = "https://www.monetdb.org/";, - maintainer = "Sjoerd Mullender", - maintainer_email = "[email protected]", - license = "Mozilla Public License, v. 2.0", - packages = ['autogen'], - scripts = ['autogen.py']) diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,3 +1,8 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Thu Oct 11 2018 Martin van Dinther <[email protected]> +- The mclient program can now be quit by typing quit or exit on the + command-line. This makes it easier for novice users to quit the program + if they do not know that the standard command to quit is \q. + diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c --- a/clients/mapiclient/dump.c +++ b/clients/mapiclient/dump.c @@ -58,22 +58,20 @@ get_with_comments_as_clause(Mapi mid) "WHERE id = language_id" ")"; - MapiHdl hdl; - const char *comments_clause; - - hdl = mapi_query(mid, query); - if (mapi_error(mid)) { - if (hdl) { + bool has_sys_comments = false; + MapiHdl hdl = mapi_query(mid, query); + if (hdl) { + if (mapi_error(mid)) { mapi_explain_result(hdl, stderr); - mapi_close_handle(hdl); - } else - mapi_explain(mid, stderr); - return NULL; - } - comments_clause = mapi_fetch_row(hdl) ? new_clause : old_clause; - mapi_close_handle(hdl); + } else { + if (mapi_fetch_row(hdl)) + has_sys_comments = true; + } + mapi_close_handle(hdl); + } else + mapi_explain(mid, stderr); - return comments_clause; + return has_sys_comments ? new_clause : old_clause; } const char * @@ -82,6 +80,7 @@ get_comments_clause(Mapi mid) static const char *comments_clause = NULL; if (comments_clause == NULL) { comments_clause = get_with_comments_as_clause(mid); + assert(comments_clause != NULL); } return comments_clause; } @@ -935,9 +934,6 @@ describe_table(Mapi mid, const char *sch bool hashge; const char *comments_clause = get_comments_clause(mid); - if (comments_clause == NULL) - return 1; - if (schema == NULL) { if ((sname = strchr(tname, '.')) != NULL) { size_t len = sname - tname; @@ -1252,9 +1248,6 @@ describe_sequence(Mapi mid, const char * char *sname = NULL; const char *comments_clause = get_comments_clause(mid); - if (comments_clause == NULL) - return 1; - if (schema == NULL) { if ((sname = strchr(tname, '.')) != NULL) { size_t len = sname - tname; @@ -1354,9 +1347,6 @@ describe_schema(Mapi mid, const char *sn char schemas[5120]; const char *comments_clause = get_comments_clause(mid); - if (comments_clause == NULL) - return 1; - snprintf(schemas, sizeof(schemas), "%s " "SELECT s.name, a.name, c.remark " @@ -1612,10 +1602,8 @@ dump_function(Mapi mid, stream *toConsol int flang, ftype; const char *comments_clause = get_comments_clause(mid); - if (comments_clause == NULL) - return 1; - - if ((query = malloc(query_size)) == NULL) + query = malloc(query_size); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
