Changeset: ac44cd9c9160 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ac44cd9c9160
Modified Files:
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: sqlfuncfix
Log Message:
Merge conflict leftover
diffs (10 lines):
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
@@ -949,6 +949,5 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'profiler') and name = 'getlimit';
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'wlc') and name in ('clock', 'tick');
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'wlr') and name in ('clock', 'tick');
-=======
drop view sys.systemfunctions;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
