Changeset: 9d161dd17da1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d161dd17da1
Added Files:
sql/test/Users/Tests/createUserRollback.SQL.py
sql/test/Users/Tests/createUserRollback.stable.err
sql/test/Users/Tests/createUserRollback.stable.out
Modified Files:
gdk/gdk_batop.c
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/test/Users/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merged with Jun2020
diffs (truncated from 424 to 300 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -496,6 +496,8 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
BUN r;
PROPrec *prop, *nprop;
oid hseq = n->hseqbase;
+ char buf[64];
+ lng t0 = 0;
if (b == NULL || n == NULL || (cnt = BATcount(n)) == 0) {
return GDK_SUCCEED;
@@ -503,6 +505,11 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
assert(b->batCacheid > 0);
assert(b->theap.parentid == 0);
+ TRC_DEBUG_IF(ALGO) {
+ t0 = GDKusec();
+ snprintf(buf, sizeof(buf), ALGOBATFMT, ALGOBATPAR(b));
+ }
+
ALIGNapp(b, force, GDK_FAIL);
if (ATOMstorage(ATOMtype(b->ttype)) != ATOMstorage(ATOMtype(n->ttype)))
{
@@ -518,7 +525,7 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
cnt = canditer_init(&ci, n, s);
if (cnt == 0) {
- return GDK_SUCCEED;
+ goto doreturn;
}
if (BUNlast(b) + cnt > BUN_MAX) {
@@ -585,14 +592,14 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
if (BATcount(b) == 0)
BATtseqbase(b, n->tseqbase + ci.seq - hseq);
BATsetcount(b, BATcount(b) + cnt);
- return GDK_SUCCEED;
+ goto doreturn;
}
if ((BATcount(b) == 0 || is_oid_nil(b->tseqbase)) &&
n->ttype == TYPE_void && is_oid_nil(n->tseqbase)) {
/* both b and n are void/nil */
BATtseqbase(b, oid_nil);
BATsetcount(b, BATcount(b) + cnt);
- return GDK_SUCCEED;
+ goto doreturn;
}
/* we need to materialize b; allocate enough capacity */
b->batCapacity = BATcount(b) + cnt;
@@ -707,6 +714,13 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
}
if (b->thash)
BATsetprop(b, GDK_NUNIQUE, TYPE_oid, &(oid){b->thash->nunique});
+
+ doreturn:
+ TRC_DEBUG(ALGO, "b=%s,n=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ " -> " ALGOBATFMT " (" LLFMT " usec)\n",
+ buf, ALGOBATPAR(n), ALGOOPTBATPAR(s), ALGOBATPAR(b),
+ GDKusec() - t0);
+
return GDK_SUCCEED;
}
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1958,6 +1958,11 @@ OPTmergetableImplementation(Client cntxt
TRC_INFO(MAL_OPTIMIZER, "Mergetable bailout semijoin
ref\n");
bailout = 1;
}
+ if (getModuleId(p) == algebraRef &&
+ getFunctionId(p) == thetajoinRef ) {
+ TRC_INFO(MAL_OPTIMIZER, "Mergetable bailout thetajoin
ref\n");
+ bailout = 1;
+ }
if (isSample(p)) {
bailout = 1;
}
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1943,7 +1943,7 @@ stmt_join_cand(backend *be, stmt *op1, s
return NULL;
break;
case cmp_notequal:
- q = newStmt(mb, algebraRef, antijoinRef);
+ q = newStmt(mb, algebraRef, thetajoinRef);
q = pushReturn(mb, q, newTmpVariable(mb, TYPE_any));
q = pushArgument(mb, q, op1->nr);
q = pushArgument(mb, q, op2->nr);
@@ -1955,6 +1955,7 @@ stmt_join_cand(backend *be, stmt *op1, s
q = pushNil(mb, q, TYPE_bat);
else
q = pushArgument(mb, q, rcand->nr);
+ q = pushInt(mb, q, JOIN_NE);
q = pushBit(mb, q, FALSE);
q = pushNil(mb, q, TYPE_lng);
if (q == NULL)
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
@@ -2104,7 +2104,7 @@ sql_update_jun2020(Client c, mvc *sql, c
pos += snprintf(buf + pos, bufsize - pos,
"update sys.args set name = name || '_' || cast(number
as string) where name in ('arg', 'res') and func_id in (select id from
sys.functions f where f.system);\n");
pos += snprintf(buf + pos, bufsize - pos,
- "insert into sys.dependencies values ((select id from
sys.functions where name = 'ms_round' and schema_id = (select id from
sys.schemas where name = 'sys')), (select id from sys.functions where name =
'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select dependency_type_id from sys.dependency_types where dependency_type_name
= 'FUNCTION'));\n");
+ "insert into sys.dependencies values ((select id from
sys.functions where name = 'ms_trunc' and schema_id = (select id from
sys.schemas where name = 'sys')), (select id from sys.functions where name =
'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select dependency_type_id from sys.dependency_types where dependency_type_name
= 'FUNCTION'));\n");
/* 12_url */
pos += snprintf(buf + pos, bufsize - pos,
diff --git a/sql/test/Users/Tests/All b/sql/test/Users/Tests/All
--- a/sql/test/Users/Tests/All
+++ b/sql/test/Users/Tests/All
@@ -28,3 +28,4 @@ copyinto
schemaRights
metadataConsistency
sessioncontrol
+createUserRollback
diff --git a/sql/test/Users/Tests/createUserRollback.SQL.py
b/sql/test/Users/Tests/createUserRollback.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/Users/Tests/createUserRollback.SQL.py
@@ -0,0 +1,25 @@
+import sys
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+with process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as c:
+ out, err = c.communicate('''
+ CREATE TABLE sys.myvar (c BIGINT);
+ INSERT INTO sys.myvar VALUES ((SELECT COUNT(*) FROM sys.users));
+
+ START TRANSACTION;
+ CREATE USER "1" WITH PASSWORD '1' NAME '1' SCHEMA "sys";
+ ROLLBACK;
+
+ SELECT CAST(COUNT(*) - (SELECT c FROM sys.myvar) AS BIGINT) FROM
sys.users; --the total count, cannot change
+ DROP TABLE sys.myvar;
+ ''')
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+
+with process.client('sql',user='1',passwd='1', stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE) as c: # error should not be possible
to login
+ out, err = c.communicate('SELECT 1;')
+ sys.stdout.write(out)
+ sys.stderr.write(err)
diff --git a/sql/test/Users/Tests/createUserRollback.stable.err
b/sql/test/Users/Tests/createUserRollback.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/Users/Tests/createUserRollback.stable.err
@@ -0,0 +1,12 @@
+stderr of test 'createUserRollback` in directory 'sql/test/Users` itself:
+
+
+# 12:24:01 >
+# 12:24:01 > "/usr/bin/python3" "createUserRollback.SQL.py"
"createUserRollback"
+# 12:24:01 >
+
+
+# 12:24:01 >
+# 12:24:01 > "Done."
+# 12:24:01 >
+
diff --git a/sql/test/Users/Tests/createUserRollback.stable.out
b/sql/test/Users/Tests/createUserRollback.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/Users/Tests/createUserRollback.stable.out
@@ -0,0 +1,25 @@
+stdout of test 'createUserRollback` in directory 'sql/test/Users` itself:
+
+
+# 12:24:01 >
+# 12:24:01 > "/usr/bin/python3" "createUserRollback.SQL.py"
"createUserRollback"
+# 12:24:01 >
+
+#CREATE TABLE sys.myvar (c BIGINT);
+#INSERT INTO sys.myvar VALUES ((SELECT COUNT(*) FROM sys.users));
+[ 1 ]
+#START TRANSACTION;
+#CREATE USER "1" WITH PASSWORD '1' NAME '1' SCHEMA "sys";
+#ROLLBACK;
+#SELECT CAST(COUNT(*) - (SELECT c FROM sys.myvar) AS BIGINT) FROM sys.users;
--the total count, cannot change
+% . # table_name
+% %7 # name
+% bigint # type
+% 1 # length
+[ 0 ]
+#DROP TABLE sys.myvar;
+
+# 12:24:01 >
+# 12:24:01 > "Done."
+# 12:24:01 >
+
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
@@ -5907,7 +5907,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (34148, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_round' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
drop function isaURL(url);
CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
---
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
+++
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
@@ -5907,7 +5907,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (34143, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_round' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
drop function isaURL(url);
CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (30284, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_round' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
drop function isaURL(url);
CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (30284, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_round' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
drop function isaURL(url);
CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
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
@@ -5953,7 +5953,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (30935, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_round' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
drop function isaURL(url);
CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -5120,7 +5120,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (30279, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_round' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
drop function isaURL(url);
CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5953,7 +5953,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (30930, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_round' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
drop function isaURL(url);
CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
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
@@ -5907,7 +5907,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (13525, 147, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
+insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_trunc' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_round' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
drop function isaURL(url);
CREATE function isaURL(theUrl string) RETURNS BOOL
EXTERNAL NAME url."isaURL";
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
@@ -5120,7 +5120,7 @@ set schema "sys";
update sys.functions set language = language - 2 where language in (8, 9);
insert into sys.args values (12285, 138, 'arg_2', 'varchar', 0, 0, 1, 2);
update sys.args set name = name || '_' || cast(number as string) where name in
('arg', 'res') and func_id in (select id from sys.functions f where f.system);
-insert into sys.dependencies values ((select id from sys.functions where name
= 'ms_round' and schema_id = (select id from sys.schemas where name = 'sys')),
(select id from sys.functions where name = 'ms_trunc' and schema_id = (select
id from sys.schemas where name = 'sys')), (select dependency_type_id from
sys.dependency_types where dependency_type_name = 'FUNCTION'));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
