Changeset: 98fe009c5e33 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98fe009c5e33
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.err
sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.out
Branch: Dec2011
Log Message:
fix crash and approved output
(transplanted from e2d3ecc7237c574fcbf8d6af5d32cf7af1ad0386)
diffs (92 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
@@ -4629,7 +4629,7 @@ rel_select_exp(mvc *sql, sql_rel *rel, s
return rel_simple_select(sql, rel, sn->where, sn->selection,
sn->distinct);
/* if within the selection, keep the current projections */
- if (outer && is_project(outer->op) && !is_processed(outer) &&
!rel_is_ref(outer)) {
+ if (outer && is_project(outer->op) && !is_processed(outer) &&
!rel_is_ref(outer) && outer->l) {
/* keep projections the hard way, ie don't rename them */
assert(rel->l == outer);
diff --git
a/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.err
b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.err
--- a/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.err
+++ b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.err
@@ -1,1 +1,40 @@
-I'm not sure what the output should be, but not a crash.
+stderr of test 'nested-select-crash.Bug-3009` in directory
'test/BugTracker-2012` itself:
+
+
+# 16:07:02 >
+# 16:07:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=4" "--set"
"gdk_dbfarm=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=31869" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 16:07:02 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# 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 = 4
+# cmdline opt gdk_dbfarm =
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 31869
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 16:07:02 >
+# 16:07:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=31869"
+# 16:07:02 >
+
+MAPI = monetdb@niels:31869
+QUERY = select 1 as y, (select x from (select 1) as test where x = y);
+ERROR = !SELECT: identifier 'x' unknown
+
+# 16:07:02 >
+# 16:07:02 > "Done."
+# 16:07:02 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.out
b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.out
--- a/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.out
+++ b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.out
@@ -1,1 +1,30 @@
-I'm not sure what the output should be, but not a crash.
+stdout of test 'nested-select-crash.Bug-3009` in directory
'test/BugTracker-2012` itself:
+
+
+# 16:07:02 >
+# 16:07:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=4" "--set"
"gdk_dbfarm=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=31869" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 16:07:02 >
+
+# MonetDB 5 server v11.8.0
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.779 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:31869/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 16:07:02 >
+# 16:07:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=31869"
+# 16:07:02 >
+
+
+# 16:07:02 >
+# 16:07:02 > "Done."
+# 16:07:02 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
