Changeset: 93bd9c6b2342 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93bd9c6b2342
Modified Files:
sql/backends/monet5/sql_scenario.c
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Branch: default
Log Message:
Fix upgrade: only call mvc_commit if commit pending.
Also approve upgrade.
diffs (87 lines):
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -544,7 +544,10 @@ SQLinit(Client c)
} else if (maybeupgrade) {
SQLtrans(m);
SQLupgrades(c,m);
- msg = mvc_commit(m, 0, NULL, false);
+ /* sometimes the upgrade ends in a COMMIT,
+ * sometimes not */
+ if (m->session->tr->active)
+ msg = mvc_commit(m, 0, NULL, false);
}
maybeupgrade = 0;
}
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
@@ -5108,6 +5108,14 @@ insert into sys.functions values (136, '
insert into sys.args values (26298, 136, 'res', 'bigint', 64, 0, 0, 0);
set schema "sys";
+Running database upgrade commands:
+set schema "sys";
+create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("values" bigint) external name "sql"."deltas";
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
+set schema "sys";
+commit;
+
+# MonetDB/SQL module loaded
# 16:02:52 >
# 16:02:52 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5391" "--port=32916"
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
@@ -5108,6 +5108,14 @@ insert into sys.functions values (136, '
insert into sys.args values (12098, 136, 'res', 'bigint', 64, 0, 0, 0);
set schema "sys";
+Running database upgrade commands:
+set schema "sys";
+create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("values" bigint) external name "sql"."deltas";
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
+set schema "sys";
+commit;
+
+# MonetDB/SQL module loaded
# 16:02:52 >
# 16:02:52 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5391" "--port=32916"
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
@@ -5107,6 +5107,14 @@ insert into sys.functions values (136, '
insert into sys.args values (27041, 136, 'res', 'bigint', 64, 0, 0, 0);
set schema "sys";
+Running database upgrade commands:
+set schema "sys";
+create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("values" bigint) external name "sql"."deltas";
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
+set schema "sys";
+commit;
+
+# MonetDB/SQL module loaded
# 16:03:29 >
# 16:03:29 > "/usr/bin/python" "upgrade.SQL.py" "upgrade"
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
@@ -5108,6 +5108,14 @@ insert into sys.functions values (136, '
insert into sys.args values (12297, 136, 'res', 'bigint', 64, 0, 0, 0);
set schema "sys";
+Running database upgrade commands:
+set schema "sys";
+create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("values" bigint) external name "sql"."deltas";
+update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
+set schema "sys";
+commit;
+
+# MonetDB/SQL module loaded
# 16:03:28 >
# 16:03:28 > "/usr/bin/python" "upgrade.SQL.py" "upgrade"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
