Commit 008371b6 authored by Igor Babaev's avatar Igor Babaev

Backported from maria-5.5 the fix in the patch for mdev-4418 that

had been discovered when merging the patch from 5.3 into 5.5.
parent 25c15201
...@@ -1219,10 +1219,7 @@ JOIN::optimize() ...@@ -1219,10 +1219,7 @@ JOIN::optimize()
zero_result_cause= zero_result_cause=
"Impossible WHERE noticed after reading const tables"; "Impossible WHERE noticed after reading const tables";
select_lex->mark_const_derived(zero_result_cause); select_lex->mark_const_derived(zero_result_cause);
if (select_options & SELECT_DESCRIBE) conds=new Item_int((longlong) 0,1);
{
conds=new Item_int((longlong) 0,1);
}
goto setup_subq_exit; goto setup_subq_exit;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment