maria-developers team mailing list archive
-
maria-developers team
-
Mailing list archive
-
Message #02483
bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2799)
#At lp:maria
2799 knielsen@xxxxxxxxxxxxxxx 2010-03-09 [merge]
Automerge for buildbot test
modified:
sql/item_subselect.cc
=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc 2010-03-09 15:03:54 +0000
+++ b/sql/item_subselect.cc 2010-03-09 19:29:05 +0000
@@ -1776,6 +1776,10 @@ int subselect_single_select_engine::prep
{
if (prepared)
return 0;
+ if (select_lex->join)
+ {
+ select_lex->cleanup();
+ }
join= new JOIN(thd, select_lex->item_list,
select_lex->options | SELECT_NO_UNLOCK, result);
if (!join || !result)