Changeset: b721a685cc0d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b721a685cc0d
Branch: Jul2021
Log Message:
merged
diffs (279 lines):
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -176,7 +176,7 @@ project_oid(BAT *restrict bn, BAT *restr
const oid *restrict r2t = NULL;
struct canditer r1ci = {0}, r2ci = {0};
- if ((!lci || (lci->tpe == cand_dense && BATtdense(l))) && r1->ttype &&
!BATtdense(r1) && !r2) {
+ if ((!lci || (lci->tpe == cand_dense && BATtdense(l))) && r1->ttype &&
!BATtdense(r1) && !r2 && l->tnonil) {
if (sizeof(oid) == sizeof(lng))
return project1_lng(bn, l, r1);
else
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2382,7 +2382,7 @@ sql_update_jul2021(Client c, mvc *sql, c
"create function
sys.current_sessionid() returns int\n"
"external name
clients.current_sessionid;\n"
"grant execute on
function sys.current_sessionid to public;\n"
- "update sys.functions
set system = true where system <> true and schema_id = 2000 and name =
'current_sessionid' = %d;\n", (int) F_FUNC);
+ "update sys.functions
set system = true where system <> true and schema_id = 2000 and name =
'current_sessionid' and type = %d;\n", (int) F_FUNC);
/* 25_debug.sql */
pos += snprintf(buf + pos, bufsize - pos,
diff --git a/sql/test/SQLancer/Tests/sqlancer15.test
b/sql/test/SQLancer/Tests/sqlancer15.test
--- a/sql/test/SQLancer/Tests/sqlancer15.test
+++ b/sql/test/SQLancer/Tests/sqlancer15.test
@@ -589,6 +589,23 @@ statement ok
START TRANSACTION
statement ok
+CREATE TABLE t1(c2 CLOB)
+
+statement ok rowcount 3
+INSERT INTO t1(c2) VALUES('aaa'), ('y2qxeM9H'), (')pI')
+
+query T rowsort
+SELECT min(NULL) FROM t1 GROUP BY (0.5834739146589698)|(232)
+----
+NULL
+
+statement ok
+ROLLBACK
+
+statement ok
+START TRANSACTION
+
+statement ok
CREATE TABLE "t0" ("c3" INTERVAL SECOND)
statement ok rowcount 9
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4145,7 +4145,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -4145,7 +4145,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -4219,7 +4219,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -4219,7 +4219,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -4145,7 +4145,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -4219,7 +4219,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4145,7 +4145,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -4219,7 +4219,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -4145,7 +4145,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -3550,7 +3550,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -4219,7 +4219,7 @@ drop procedure sys.vacuum(string, string
create function sys.current_sessionid() returns int
external name clients.current_sessionid;
grant execute on function sys.current_sessionid to public;
-update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' = 1;
+update sys.functions set system = true where system <> true and schema_id =
2000 and name = 'current_sessionid' and type = 1;
drop procedure sys.flush_log();
drop function sys.deltas(string);
drop function sys.deltas(string, string);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
