Commit f75a5188 authored by unknown's avatar unknown
Browse files

merged 


sql/sql_lex.cc:
  ul
parents e2e51911 e2d9929d

sql/sql_yacc.yy

+0 −1
Original line number Diff line number Diff line
@@ -2438,7 +2438,6 @@ select_part2: 
	{

	  LEX *lex= Lex;

	  SELECT_LEX *sel= lex->current_select;

	  lex->lock_option= TL_READ;

	  if (sel->linkage != UNION_TYPE)

	    mysql_init_select(lex);

	  lex->current_select->parsing_place= SELECT_LIST;