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;
+ b->batDirtydesc = true;
}
if (nils == 0 && !b->tnonil) {
- b->tnonil = 1;
- b->batDirtydesc = 1;
+ b->tnonil = true;
+ b->batDirtydesc = true;
}
return bn;
@@ -617,12 +617,12 @@ BATcalciszero(BAT *b, BAT *s)
bn->tnonil = nils == 0;
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;
@@ -749,12 +749,12 @@ BATcalcsign(BAT *b, BAT *s)
bn->tnonil = nils == 0;
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;
@@ -1010,14 +1010,14 @@ BATcalcmin(BAT *b1, BAT *b2, BAT *s)
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
- bn->tsorted = 1;
- bn->trevsorted = 1;
- bn->tkey = 1;
+ bn->tsorted = true;
+ bn->trevsorted = true;
+ bn->tkey = true;
bn->tseqbase = ATOMtype(b1->ttype) == TYPE_oid ? cnt == 1 ?
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
- bn->tsorted = 0;
- bn->trevsorted = 0;
- bn->tkey = 0;
+ bn->tsorted = false;
+ bn->trevsorted = false;
+ bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1094,14 +1094,14 @@ BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
- bn->tsorted = 1;
- bn->trevsorted = 1;
- bn->tkey = 1;
+ bn->tsorted = true;
+ bn->trevsorted = true;
+ bn->tkey = true;
bn->tseqbase = ATOMtype(b1->ttype) == TYPE_oid ? cnt == 1 ?
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
- bn->tsorted = 0;
- bn->trevsorted = 0;
- bn->tkey = 0;
+ bn->tsorted = false;
+ bn->trevsorted = false;
+ bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1173,14 +1173,14 @@ BATcalcmincst(BAT *b, const ValRecord *v
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
- bn->tsorted = 1;
- bn->trevsorted = 1;
- bn->tkey = 1;
+ bn->tsorted = true;
+ bn->trevsorted = true;
+ bn->tkey = true;
bn->tseqbase = ATOMtype(bn->ttype) == TYPE_oid ? cnt == 1 ?
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
- bn->tsorted = 0;
- bn->trevsorted = 0;
- bn->tkey = 0;
+ bn->tsorted = false;
+ bn->trevsorted = false;
+ bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1262,14 +1262,14 @@ BATcalcmincst_no_nil(BAT *b, const ValRe
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
- bn->tsorted = 1;
- bn->trevsorted = 1;
- bn->tkey = 1;
+ bn->tsorted = true;
+ bn->trevsorted = true;
+ bn->tkey = true;
bn->tseqbase = ATOMtype(bn->ttype) == TYPE_oid ? cnt == 1 ?
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
- bn->tsorted = 0;
- bn->trevsorted = 0;
- bn->tkey = 0;
+ bn->tsorted = false;
+ bn->trevsorted = false;
+ bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1348,14 +1348,14 @@ BATcalcmax(BAT *b1, BAT *b2, BAT *s)
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
- bn->tsorted = 1;
- bn->trevsorted = 1;
- bn->tkey = 1;
+ bn->tsorted = true;
+ bn->trevsorted = true;
+ bn->tkey = true;
bn->tseqbase = ATOMtype(bn->ttype) == TYPE_oid ? cnt == 1 ?
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
- bn->tsorted = 0;
- bn->trevsorted = 0;
- bn->tkey = 0;
+ bn->tsorted = false;
+ bn->trevsorted = false;
+ bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1432,14 +1432,14 @@ BATcalcmax_no_nil(BAT *b1, BAT *b2, BAT
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
- bn->tsorted = 1;
- bn->trevsorted = 1;
- bn->tkey = 1;
+ bn->tsorted = true;
+ bn->trevsorted = true;
+ bn->tkey = true;
bn->tseqbase = ATOMtype(b1->ttype) == TYPE_oid ? cnt == 1 ?
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
- bn->tsorted = 0;
- bn->trevsorted = 0;
- bn->tkey = 0;
+ bn->tsorted = false;
+ bn->trevsorted = false;
+ bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1511,14 +1511,14 @@ BATcalcmaxcst(BAT *b, const ValRecord *v
bn->tnil = nils > 0;
bn->tnonil = nils == 0;
if (cnt <= 1) {
- bn->tsorted = 1;
- bn->trevsorted = 1;
- bn->tkey = 1;
+ bn->tsorted = true;
+ bn->trevsorted = true;
+ bn->tkey = true;
bn->tseqbase = ATOMtype(bn->ttype) == TYPE_oid ? cnt == 1 ?
*(oid*)Tloc(bn,0) : 0 : oid_nil;
} else {
- bn->tsorted = 0;
- bn->trevsorted = 0;
- bn->tkey = 0;
+ bn->tsorted = false;
+ bn->trevsorted = false;
+ bn->tkey = false;
bn->tseqbase = oid_nil;
}
return bn;
@@ -1600,14 +1600,14 @@ BATcalcmaxcst_no_nil(BAT *b, const ValRe
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
