summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-04-15 19:20:15 +0200
committerunknown <serg@serg.mylan>2005-04-15 19:20:15 +0200
commite2d9929d2c5eb6410e01d1eda0b1eb81ac544a9e (patch)
tree325e8c100c7dc6db36f70c5046869e9af1cdd975 /sql/sql_lex.cc
parent2a8f6bb18818178e66ea9f1ba058a98c49a353fb (diff)
downloadmariadb-git-e2d9929d2c5eb6410e01d1eda0b1eb81ac544a9e.tar.gz
BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
don't set lex->lock_option=TL_READ in the parser for SELECT
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index d62edf83c11..20aacf42be0 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -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);