bk commit into 4.0 tree (serg:1.2088) BUG#9922

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2088 05/04/15 19:20:15 serg@stripped +2 -0
  BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
  don't set lex->lock_option=TL_READ in the parser for SELECT

  sql/sql_yacc.yy
    1.235 05/04/15 19:20:12 serg@stripped +0 -1
    BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
    don't set lex->lock_option=TL_READ in the parser for SELECT

  sql/sql_lex.cc
    1.41 05/04/15 19:20:12 serg@stripped +1 -0
    BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
    don't set lex->lock_option=TL_READ in the parser for SELECT

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.0

--- 1.40/sql/sql_lex.cc	Wed Jul  2 17:55:09 2003
+++ 1.41/sql/sql_lex.cc	Fri Apr 15 19:20:12 2005
@@ -147,6 +147,7 @@
   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);

--- 1.234/sql/sql_yacc.yy	Fri Feb 18 13:50:18 2005
+++ 1.235/sql/sql_yacc.yy	Fri Apr 15 19:20:12 2005
@@ -1531,7 +1531,6 @@
 select_part2:
 	{
 	  LEX *lex=Lex;
-	  lex->lock_option=TL_READ;
           mysql_init_select(lex);
 	}
 	select_options select_item_list select_into select_lock_type;