summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-06-08 22:15:49 -0700
committerIgor Babaev <igor@askmonty.org>2012-06-08 22:15:49 -0700
commit10f42e2c33dff630559299e4151e10a84ce39fd8 (patch)
treec201a24f62b2e2dbfa1114d9d1eee76477d61d8a /sql/sql_parse.cc
parentca5473f1db6dc63baffc736737e54bdffd6449a6 (diff)
downloadmariadb-git-10f42e2c33dff630559299e4151e10a84ce39fd8.tar.gz
Fixed LP bug #1010729.
The bug prevented acceptance of UNION queries whose non-first select clauses contained join expressions with degenerated single-table nests as valid queries. The bug was introduced into mysql-5.5 code line by the patch for bug 33204.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 70258629197..4ee458c9806 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -6192,6 +6192,7 @@ TABLE_LIST *st_select_lex::end_nested_join(THD *thd)
embedded->embedding= embedding;
join_list->push_front(embedded);
ptr= embedded;
+ embedded->lifted= 1;
}
else if (nested_join->join_list.elements == 0)
{