summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/sql_lex.cc1
-rw-r--r--sql/sql_yacc.yy1
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;