diff options
| author | unknown <serg@serg.mylan> | 2005-04-15 19:20:15 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-04-15 19:20:15 +0200 |
| commit | e2d9929d2c5eb6410e01d1eda0b1eb81ac544a9e (patch) | |
| tree | 325e8c100c7dc6db36f70c5046869e9af1cdd975 /sql | |
| parent | 2a8f6bb18818178e66ea9f1ba058a98c49a353fb (diff) | |
| download | mariadb-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')
| -rw-r--r-- | sql/sql_lex.cc | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
2 files changed, 1 insertions, 1 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); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 39b57061507..8c5c4d61d1d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -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; |