diff options
| author | unknown <mats@mysql.com> | 2005-02-18 14:19:08 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2005-02-18 14:19:08 +0100 |
| commit | ac57068a7b75b4ff6117fad8cc10b11e4f3bc4cd (patch) | |
| tree | 15410149119f6d50623d3ba91132ddb2e6b23dab /sql/sql_yacc.yy | |
| parent | cfa78c2645d3a0c3eaf02a256f63d2d284ed2b3b (diff) | |
| parent | 41a329f9a190c05767332b816496c52ee40b3ab9 (diff) | |
| download | mariadb-git-ac57068a7b75b4ff6117fad8cc10b11e4f3bc4cd.tar.gz | |
Merge from 4.0
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Merged from 4.0
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 988323811ac..9f25e17b6fd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1111,7 +1111,7 @@ create_select: SELECT_SYM { LEX *lex=Lex; - lex->lock_option= (using_update_log) ? TL_READ_NO_INSERT : TL_READ; + lex->lock_option= using_update_log ? TL_READ_NO_INSERT : TL_READ; if (lex->sql_command == SQLCOM_INSERT) lex->sql_command= SQLCOM_INSERT_SELECT; else if (lex->sql_command == SQLCOM_REPLACE) |