Commit 20295cf1 authored by sergefp@mysql.com's avatar sergefp@mysql.com

Post-merge fixes

parent 60563049
...@@ -143,7 +143,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result) ...@@ -143,7 +143,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result)
first_select->braces= 1; first_select->braces= 1;
} }
for (sl= select_cursor; sl; sl= sl->next_select()) for (;sl; sl= sl->next_select())
{ {
JOIN *join= new JOIN(thd_arg, sl->item_list, JOIN *join= new JOIN(thd_arg, sl->item_list,
sl->options | thd_arg->options | SELECT_NO_UNLOCK, sl->options | thd_arg->options | SELECT_NO_UNLOCK,
......
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