MonetDB: rename-sql - Merge with default
Changeset: f02b13a3278f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f02b13a3278f
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
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
common/stream/stream.c
configure.ag
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_qsort.c
gdk/gdk_qsort_impl.h
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_session.c
sql/ChangeLog
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/vaults/bam/bam_db_interface.c
sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql
sql/benchmarks/tpch/load-sf-0.01.sql
sql/benchmarks/tpch/load-sf-1.sql
sql/common/sql_list.c
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2018/Tests/All
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Users/Tests/copyinto.stable.err
sql/test/Users/Tests/copyinto.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
testing/Mtest.py.in
testing/exportutils.py
testing/listexports.py.in
tools/mserver/monet_version.c.in
Branch: rename-sql
Log Message:
Merge with default
diffs (truncated from 4417 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -878,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
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -910,5 +910,6 @@ typedef __uint128_t uhge;
#define PROMPT1"\001\001\n"/* prompt: ready for new query
*/
#define PROMPT2"\001\002\n"/* prompt: more data needed */
+#define PROMPT3"\001\003\n"/* prompt: get file content */
#endif /* _SEEN_MONETDB_CONFIG_H */
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -10929,7 +10929,7 @@ Ready.
[ "sql", "bind_idxbat", "pattern sql.bind_idxbat(mvc:int, schema:str,
table:str, index:str, access:int, part_nr:int, nr_parts:int):bat[:any_1] ",
"mvc_bind_idxbat_wrap;","Bind the 'schema.table.index' BAT with
access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ]
[ "sql", "clear_table", "pattern sql.clear_table(sname:str,
tname:str):lng ", "mvc_clear_table_wrap;","Clear the table
sname.tname." ]
[ "sql", "commit", "pattern sql.commit():void ", "SQLcommit;",
"Trigger the commit operation for a MAL block" ]
-[ "sql", "copy_from","pattern
MonetDB: rename-sql - Merge with default.
Changeset: b03a05e1f3c6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b03a05e1f3c6
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
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
vertoo.data
Branch: rename-sql
Log Message:
Merge with default.
diffs (truncated from 606 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 - 11.31.11-20181011
+- Some subtle dependencies between RPMs have been fixed.
+
* Wed Feb 14 2018 Stefan Manegold - 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,5 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
* Wed Oct 10 2018 Sjoerd Mullender
-- Some subtle dependencies between RPMs have been fixed.
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1062,6 +1062,14 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Thu Oct 11 2018 Sjoerd Mullender - 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 - 11.31.11-20181011
+- MonetDB: Some subtle dependencies between RPMs have been fixed.
+
* Fri Oct 05 2018 Sjoerd Mullender - 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 = "i...@monetdb.org",
- url = "https://www.monetdb.org/;,
- maintainer = "Sjoerd Mullender",
- maintainer_email = "i...@monetdb.org",
- 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
+- 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) {
MonetDB: rename-sql - Merge with default
Changeset: 2f808bb6231a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f808bb6231a
Modified Files:
ChangeLog.Aug2018
MonetDB.spec
clients/mapiclient/mhelp.c
rpm.mk.in
testing/Mtest.py.in
Branch: rename-sql
Log Message:
Merge with default
diffs (truncated from 376 to 300 lines):
diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018
--- a/ChangeLog.Aug2018
+++ b/ChangeLog.Aug2018
@@ -1,2 +1,5 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+* Wed Oct 10 2018 Sjoerd Mullender
+- Some subtle dependencies between RPMs have been fixed.
+
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
@@ -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
MonetDB: rename-sql - Merge with default.
Changeset: 5f325c009606 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f325c009606 Added Files: gdk/xoshiro256starstar.h sql/test/sample/Tests/All sql/test/sample/Tests/sample.1.sql sql/test/sample/Tests/sample.1.stable.err sql/test/sample/Tests/sample.1.stable.out sql/test/sample/Tests/sample.10.sql sql/test/sample/Tests/sample.10.stable.err sql/test/sample/Tests/sample.10.stable.out sql/test/sample/Tests/sample.11.sql sql/test/sample/Tests/sample.11.stable.err sql/test/sample/Tests/sample.11.stable.out sql/test/sample/Tests/sample.12.sql sql/test/sample/Tests/sample.12.stable.err sql/test/sample/Tests/sample.12.stable.out sql/test/sample/Tests/sample.13.sql sql/test/sample/Tests/sample.13.stable.err sql/test/sample/Tests/sample.13.stable.out sql/test/sample/Tests/sample.14.sql sql/test/sample/Tests/sample.14.stable.err sql/test/sample/Tests/sample.14.stable.out sql/test/sample/Tests/sample.15.sql sql/test/sample/Tests/sample.15.stable.err sql/test/sample/Tests/sample.15.stable.out sql/test/sample/Tests/sample.2.sql sql/test/sample/Tests/sample.2.stable.err sql/test/sample/Tests/sample.2.stable.out sql/test/sample/Tests/sample.3.sql sql/test/sample/Tests/sample.3.stable.err sql/test/sample/Tests/sample.3.stable.out sql/test/sample/Tests/sample.4.sql sql/test/sample/Tests/sample.4.stable.err sql/test/sample/Tests/sample.4.stable.out sql/test/sample/Tests/sample.5.sql sql/test/sample/Tests/sample.5.stable.err sql/test/sample/Tests/sample.5.stable.out sql/test/sample/Tests/sample.6.sql sql/test/sample/Tests/sample.6.stable.err sql/test/sample/Tests/sample.6.stable.out sql/test/sample/Tests/sample.7.sql sql/test/sample/Tests/sample.7.stable.err sql/test/sample/Tests/sample.7.stable.out sql/test/sample/Tests/sample.8.sql sql/test/sample/Tests/sample.8.stable.err sql/test/sample/Tests/sample.8.stable.out sql/test/sample/Tests/sample.9.sql sql/test/sample/Tests/sample.9.stable.err sql/test/sample/Tests/sample.9.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/Makefile.ag gdk/gdk.h gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_sample.c monetdb5/modules/mal/sample.c monetdb5/modules/mal/sample.h monetdb5/modules/mal/sample.mal sql/ChangeLog sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/server/rel_select.c sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_scan.c sql/test/BugTracker/Tests/drop_sequence_crash.SF-1505973.sql sql/test/BugTracker/Tests/drop_sequence_crash_2.SF-1505973.sql Branch: rename-sql Log Message: Merge with default. diffs (truncated from 2344 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -10897,8 +10897,10 @@ Ready. [ "sabaoth", "marchScenario","command sabaoth.marchScenario(lang:str):void ","SABmarchScenario;", "Publishes the given language as available for this server" ] [ "sabaoth", "prelude", "command sabaoth.prelude():void ", "SABprelude;", "Initialise the sabaoth module" ] [ "sabaoth", "retreatScenario", "command sabaoth.retreatScenario(lang:str):void ", "SABretreatScenario;", "Unpublishes the given language as available for this server" ] -[ "sample","subuniform", "command sample.subuniform(b:bat[:any], s:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample of size s"] -[ "sample","subuniform", "command sample.subuniform(b:bat[:any], p:dbl):bat[:oid] ", "SAMPLEuniform_dbl;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0"] +[ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], p:dbl):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0"] +[ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], p:dbl, sample_seed:int):bat[:oid] ","SAMPLEuniform;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 and where the prg is seeded with sample_seed" ] +[ "sample","subuniform", "pattern sample.subuniform(b:bat[:any], sample_size:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the
MonetDB: rename-sql - Merge with default
Changeset: 65b77821328d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65b77821328d
Added Files:
sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.sql
sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.err
sql/test/BugTracker-2018/Tests/convert-key.Bug-6648.stable.out
sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.sql
sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.err
sql/test/BugTracker-2018/Tests/update-transaction-select.Bug-6649.stable.out
Modified Files:
MonetDB.spec
clients/mapiclient/ReadlineTools.c
gdk/gdk_calc.c
sql/backends/monet5/sql.c
sql/server/rel_select.c
sql/test/BugTracker-2018/Tests/All
sql/test/group-concat/Tests/groupconcat01.sql
sql/test/group-concat/Tests/groupconcat01.stable.out
sql/test/group-concat/Tests/groupconcat05.sql
sql/test/group-concat/Tests/groupconcat05.stable.out
Branch: rename-sql
Log Message:
Merge with default
diffs (truncated from 1758 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -350,7 +350,8 @@ This package contains the files needed t
Summary: MonetDB ODBC driver
Group: Applications/Databases
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-Requires(pre): unixODBC
+Requires(post): unixODBC
+Requires(postun): unixODBC
%description client-odbc
MonetDB is a database management system that is developed from a
@@ -737,10 +738,10 @@ used from the MAL level.
%package SQL-server5
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
-Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release}
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
# RHEL >= 7, and all current Fedora
-Requires: %{_bindir}/systemd-tmpfiles
+Requires(post): %{_bindir}/systemd-tmpfiles
%endif
%if (0%{?fedora} >= 22)
%if %{with hugeint}
@@ -881,9 +882,12 @@ Group: Applications/Databases
%if "%{?_selinux_policy_version}" != ""
Requires: selinux-policy >= %{?_selinux_policy_version}
%endif
-Requires: %{name}-SQL-server5 = %{version}-%{release}
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles,
MonetDB-SQL-server5, MonetDB5-server
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles,
MonetDB-SQL-server5, MonetDB5-server
+Requires(post): MonetDB5-server = %{version}-%{release}
+Requires(postun): MonetDB5-server
+Requires(post): %{name}-SQL-server5 = %{version}-%{release}
+Requires(postun): %{name}-SQL-server5
+Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
+Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
BuildArch: noarch
%global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if
($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null)
diff --git a/clients/mapiclient/ReadlineTools.c
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -136,7 +136,7 @@ sql_completion(const char *text, int sta
/* The MAL completion help */
-static char *mal_commands[] = {
+static const char *mal_commands[] = {
"address",
"atom",
"barrier",
@@ -209,7 +209,8 @@ mal_command_generator(const char *text,
static int64_t seekpos, rowcount;
static size_t len;
static MapiHdl table_hdl;
- char *name, *buf;
+ const char *name;
+ char *buf;
/* we pick our own portion of the linebuffer */
text = rl_line_buffer + strlen(rl_line_buffer) - 1;
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -241,12 +241,12 @@ BATcalcnot(BAT *b, BAT *s)
bn->tkey = b->tkey;
if (nils != 0 && !b->tnil) {
- b->tnil = 1;
- b->batDirtydesc = 1;
+ b->tnil = true;
+ b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
- b->tnonil = 1;
- b->batDirtydesc = 1;
+ b->tnonil = true;
+ b->batDirtydesc = true;
}
return bn;
@@ -360,12 +360,12 @@ BATcalcnegate(BAT *b, BAT *s)
bn->tkey = b->tkey;
if (nils != 0 && !b->tnil) {
- b->tnil = 1;
- b->batDirtydesc = 1;
+ b->tnil = true;
+ b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
- b->tnonil = 1;
- b->batDirtydesc = 1;
+ b->tnonil = true;
+ b->batDirtydesc = true;
}
return bn;
@@ -489,12 +489,12 @@ BATcalcabsolute(BAT *b, BAT *s)
bn->tnonil = nils == 0;
if (nils && !b->tnil) {
- b->tnil = 1;
- b->batDirtydesc = 1;
+ b->tnil = true;
+
MonetDB: rename-sql - Merge with default
Changeset: f2d3e5c1080e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2d3e5c1080e Added Files: clients/R/Tests/deps-install.timeout debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.sql sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.err sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.out sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.sql sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.err sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.out sql/test/miscellaneous/Tests/declared_tables.sql sql/test/miscellaneous/Tests/declared_tables.stable.err sql/test/miscellaneous/Tests/declared_tables.stable.out sql/test/sys-schema/Tests/bam_tables_checks.sql sql/test/sys-schema/Tests/bam_tables_checks.stable.err sql/test/sys-schema/Tests/bam_tables_checks.stable.out sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.err sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out sql/test/sys-schema/Tests/geom_tables_checks.sql sql/test/sys-schema/Tests/geom_tables_checks.stable.err sql/test/sys-schema/Tests/geom_tables_checks.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 tools/merovingian/daemon/config/.merovingian_properties.in tools/merovingian/daemon/config/Makefile.ag tools/merovingian/daemon/config/monetdbd.in tools/merovingian/daemon/config/monetdbd.service.in Removed Files: ChangeLog.Mar2018 buildtools/ChangeLog.Mar2018 clients/ChangeLog.Mar2018 clients/mapilib/ChangeLog.Mar2018 common/stream/ChangeLog.Mar2018 common/utils/ChangeLog.Mar2018 debian/libmonetdb16.install gdk/ChangeLog.Mar2018 geom/ChangeLog.Mar2018 monetdb5/ChangeLog.Mar2018 sql/ChangeLog.Mar2018 testing/ChangeLog.Mar2018 tools/merovingian/ChangeLog.Mar2018 tools/merovingian/daemon/.merovingian_properties.in tools/merovingian/daemon/monetdbd.service.in Modified Files: .hgtags MonetDB.spec NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog buildtools/ChangeLog-Archive buildtools/ChangeLog.Aug2018 buildtools/autogen/autogen/msc.py buildtools/doc/windowsbuild.rst clients/ChangeLog-Archive clients/ChangeLog.Aug2018 clients/R/Tests/dbapply.R clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/deps-test.timeout clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.err clients/R/Tests/install.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/examples/C/Makefile.ag clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample4.c clients/examples/C/smack00.c clients/examples/C/smack01.c clients/mapiclient/Makefile.ag clients/mapiclient/dump.c clients/mapiclient/eventparser.c clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/mnc.c clients/mapiclient/msqldump.c clients/mapiclient/msqldump.h clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/ChangeLog clients/mapilib/mapi.c clients/mapilib/mapi.h clients/mapilib/mapi.rc clients/odbc/driver/ODBCConvert.c
MonetDB: rename-sql - Merge with default.
Changeset: 53f02cef283c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53f02cef283c
Modified Files:
buildtools/autogen/autogen.py
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
clients/mapiclient/mnc.c
common/stream/stream_socket.h
common/utils/mutils.c
common/utils/mutils.h
configure.ag
gdk/gdk.h
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_private.h
gdk/gdk_system.h
gdk/gdk_utils.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/remote.c
monetdb5/tools/Makefile.ag
Branch: rename-sql
Log Message:
Merge with default.
diffs (truncated from 736 to 300 lines):
diff --git a/buildtools/autogen/autogen.py b/buildtools/autogen/autogen.py
--- a/buildtools/autogen/autogen.py
+++ b/buildtools/autogen/autogen.py
@@ -163,7 +163,7 @@ def filter(st):
return st + '\n'
return ''
-OutList.sort(key=lambda x: x.count(os.sep))
+OutList.sort(key=lambda x: x.count('/'))
OutList = map(filter, OutList)
OutListFd = open("acout.in", "w")
OutListFd.writelines(OutList)
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -762,6 +762,8 @@ def am_library(fd, var, libmap, am):
if 'MODULE' in libmap:
ldflags.append('-module')
ldflags.append('-avoid-version')
+if 'NOINST' not in libmap:
+ldflags.append('@NO_UNDEFINED@')
if "LDFLAGS" in libmap:
for x in libmap["LDFLAGS"]:
ldflags.append(x)
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -123,25 +123,24 @@ def msc_libdir(fd, var, values, msc):
def msc_mtsafe(fd, var, values, msc):
fd.write("CFLAGS=$(CFLAGS) $(thread_safe_flag_spec)\n")
-def msc_add_srcdir(path, msc, prefix =""):
-dir = path
+def msc_add_srcdir(dir, msc, prefix = ""):
if dir[0] == '$':
return ""
elif not os.path.isabs(dir):
-dir = "$(srcdir)/" + dir
+return prefix + "$(srcdir)\\" + dir.replace('/', '\\')
else:
return ""
-return prefix+dir.replace('/', '\\')
def msc_translate_dir(path, msc):
-dir = path
-rest = ""
-if path.find('/') >= 0:
-dir, rest = path.split('/', 1)
+path = path.replace('/' , '\\')
+if path.find('\\') >= 0:
+dir, rest = path.split('\\', 1)
+else:
+dir, rest = path, ''
if dir == "top_builddir":
dir = "$(TOPDIR)"
elif dir == "top_srcdir":
-dir = "$(TOPDIR)/.."
+dir = "$(TOPDIR)\\.."
elif dir == "builddir":
dir = "."
elif dir == "srcdir":
@@ -155,12 +154,12 @@ def msc_translate_dir(path, msc):
dir = "$("+dir+")"
if rest:
dir = dir+ "\\" + rest
-return dir.replace('/', '\\')
+return dir
def msc_translate_file(path, msc):
if os.path.isfile(os.path.join(msc['cwd'], path)):
-return "$(srcdir)\\" + path
-return path
+path = "$(srcdir)/" + path
+return path.replace('/', '\\')
def msc_space_sep_list(l):
res = ""
@@ -321,8 +320,8 @@ def msc_dep(fd, tar, deplist, msc):
msc['_IN'].append(y)
getsrc = ""
src = msc_translate_dir(msc_translate_ext(msc_translate_file(deplist[0],
msc)), msc)
-if os.path.split(src)[0]:
-getsrc = '\t$(INSTALL) "%s" "%s"\n' % (src, os.path.split(src)[1])
+if '\\' in src:
+getsrc = '\t$(INSTALL) "%s" "%s"\n' % (src, src.split('\\')[-1])
if ext == "tab.h":
fd.write(getsrc)
x, de = split_filename(deplist[0])
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -30,7 +30,7 @@
#ifdef HAVE_SYS_SOCKET_H
# include
#endif
-#ifdef NATIVE_WIN32
+#ifdef HAVE_WINSOCK_H
# include
#endif
#ifdef HAVE_NETDB_H
diff --git a/common/stream/stream_socket.h b/common/stream/stream_socket.h
--- a/common/stream/stream_socket.h
+++ b/common/stream/stream_socket.h
@@ -15,7 +15,7 @@
#ifdef HAVE_SYS_SOCKET_H
#include
#endif
-#ifdef NATIVE_WIN32
+#ifdef HAVE_WINSOCK_H
# include
#endif
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -444,7 +444,7 @@ get_bin_path(void)
{
/* getting the path to the executable's binary, isn't all that
* simple, unfortunately */
-#ifdef WIN32
+#ifdef NATIVE_WIN32
if (GetModuleFileName(NULL, _bin_path,
(DWORD) sizeof(_bin_path)) != 0)
return _bin_path;
@@ -479,7 +479,7 @@ get_bin_path(void)
if (realpath(execn, _bin_path) != NULL)
return(_bin_path);
}
-#else /* try Linux approach */
+#else /* try Linux
