Changeset: f5cc7e761e1e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5cc7e761e1e
Added Files:
sql/test/BugTracker-2015/Tests/union_project.Bug-3723.sql
sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.err
sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2015/Tests/All
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (118 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1732,6 +1732,9 @@ rel_rename_exps( mvc *sql, list *exps1,
rname = e2->rname;
exp_setname(sql->sa, e2, rname, e1->name );
}
+ MT_lock_set(&exps2->ht_lock, "rel_rename_exps");
+ exps2->ht = NULL;
+ MT_lock_unset(&exps2->ht_lock, "rel_rename_exps");
}
static sql_rel *
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -25,4 +25,6 @@ case_aggr.Bug-3705
assertHead.Bug-3706
ifthenelse.Bug-3699
readonly.Bug-3709
+crash_on_alter_set_not_null.Bug-3715
convert-to-bit.Bug-3719
+union_project.Bug-3723
diff --git a/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.sql
b/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.sql
@@ -0,0 +1,3 @@
+create table foo (a int);
+select b from(select 1,1=1,1,1,1 from foo union all select 1,null,1,1,1)as
t(a,b,c,d,e);
+drop table foo;
diff --git a/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.err
b/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'union_project.Bug-3723` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 15:46:00 >
+# 15:46:00 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35006" "--set"
"mapi_usock=/var/tmp/mtest-23819/.s.monetdb.35006" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 15:46:00 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35006
+# cmdline opt mapi_usock = /var/tmp/mtest-23819/.s.monetdb.35006
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 15:46:01 >
+# 15:46:01 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23819" "--port=35006"
+# 15:46:01 >
+
+
+# 15:46:01 >
+# 15:46:01 > "Done."
+# 15:46:01 >
+
diff --git a/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.out
b/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.out
@@ -0,0 +1,40 @@
+stdout of test 'union_project.Bug-3723` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 15:46:00 >
+# 15:46:00 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35006" "--set"
"mapi_usock=/var/tmp/mtest-23819/.s.monetdb.35006" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 15:46:00 >
+
+# MonetDB 5 server v11.19.10
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:35006/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23819/.s.monetdb.35006
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 15:46:01 >
+# 15:46:01 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23819" "--port=35006"
+# 15:46:01 >
+
+#create table foo (a int);
+#select b from(select 1,1=1,1,1,1 from foo union all select 1,null,1,1,1)as
t(a,b,c,d,e);
+% .t # table_name
+% b # name
+% boolean # type
+% 5 # length
+[ NULL ]
+#drop table foo;
+
+# 15:46:01 >
+# 15:46:01 > "Done."
+# 15:46:01 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
