Commit e2d9929d authored by unknown's avatar unknown
Browse files

BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs 

don't set lex->lock_option=TL_READ in the parser for SELECT
parent 2a8f6bb1

sql/sql_lex.cc

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) 
  lex->select->in_sum_expr=0;

  lex->select->expr_list.empty();

  lex->select->ftfunc_list.empty();

  lex->lock_option=TL_READ;

  lex->convert_set=(lex->thd=thd)->variables.convert_set;

  lex->yacc_yyss=lex->yacc_yyvs=0;

  lex->ignore_space=test(thd->sql_mode & MODE_IGNORE_SPACE);

sql/sql_yacc.yy

+0 −1
Original line number Diff line number Diff line
@@ -1531,7 +1531,6 @@ select_init: 
select_part2:

	{

	  LEX *lex=Lex;

	  lex->lock_option=TL_READ;

          mysql_init_select(lex);

	}

	select_options select_item_list select_into select_lock_type;