Commit 5fe52ffb authored by serg@serg.mylan's avatar serg@serg.mylan

merged

parents 16a0a689 08ae28f4
...@@ -2438,7 +2438,6 @@ select_part2: ...@@ -2438,7 +2438,6 @@ select_part2:
{ {
LEX *lex= Lex; LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select; SELECT_LEX *sel= lex->current_select;
lex->lock_option= TL_READ;
if (sel->linkage != UNION_TYPE) if (sel->linkage != UNION_TYPE)
mysql_init_select(lex); mysql_init_select(lex);
lex->current_select->parsing_place= SELECT_LIST; lex->current_select->parsing_place= SELECT_LIST;
......
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