summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-04-16 00:10:35 +0200
committerunknown <serg@serg.mylan>2005-04-16 00:10:35 +0200
commitf75a518853b621da7f2341c12a7222245044f4c6 (patch)
tree96b35113a0fccccc976cd4f198cf2f8d71de2bd1 /sql
parente2e51911556d17f96a824cefbe7672d105dc26da (diff)
parente2d9929d2c5eb6410e01d1eda0b1eb81ac544a9e (diff)
downloadmariadb-git-f75a518853b621da7f2341c12a7222245044f4c6.tar.gz
merged
sql/sql_lex.cc: ul
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index af5adbaa19f..594077dd4f3 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2438,7 +2438,6 @@ select_part2:
{
LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select;
- lex->lock_option= TL_READ;
if (sel->linkage != UNION_TYPE)
mysql_init_select(lex);
lex->current_select->parsing_place= SELECT_LIST;