Changeset: 163ba1769943 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=163ba1769943
Modified Files:
sql/server/rel_select.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (132 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4885,7 +4885,7 @@ rel_query(mvc *sql, sql_rel *rel, symbol
/* reset error */
sql->session->status = 0;
sql->errstr[0] = 0;
- if (used)
+ if (used && rel)
rel = rel_dup(rel);
if (!used && (!sn->lateral && !lateral) && rel)
{
sql_rel *o = rel;
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
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits =
39;
-set schema "sys";
# 15:26:18 >
# 15:26:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21187" "--port=38946"
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
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits =
19;
-set schema "sys";
# 15:41:19 >
# 15:41:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7576" "--port=32696"
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
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits =
39;
-set schema "sys";
# 15:26:18 >
# 15:26:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21187" "--port=38946"
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
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits =
19;
-set schema "sys";
# 15:41:18 >
# 15:41:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7576" "--port=32696"
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
@@ -22,11 +22,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits =
39;
-set schema "testschema";
# 15:26:22 >
# 15:26:22 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
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
@@ -19,11 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits =
19;
-set schema "testschema";
# 16:00:57 >
# 16:00:57 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
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
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits =
39;
-set schema "testschema";
# 15:26:24 >
# 15:26:24 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
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
@@ -19,11 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits =
19;
-set schema "testschema";
# 16:00:56 >
# 16:00:56 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
