diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 21:24:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-29 12:40:52 +0200 |
| commit | 6f17e233bf7f4de20dda8fb31f63aa52452c4e0a (patch) | |
| tree | 0163788e8e192b2eb76e8abe807c02687afd02a0 /sql/sql_yacc.yy | |
| parent | f9c02d7c29e7ddc9fa274e7fe23e5800653660f4 (diff) | |
| download | mariadb-git-6f17e233bf7f4de20dda8fb31f63aa52452c4e0a.tar.gz | |
post-merge fixes
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8f135e63113..cc16101c38b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13806,19 +13806,13 @@ lock: ; table_or_tables: - TABLE_SYM - { Lex->only_view= FALSE; } - | TABLES - { Lex->only_view= FALSE; } + TABLE_SYM { Lex->only_view= FALSE; } + | TABLES { Lex->only_view= FALSE; } ; table_or_view: - TABLE_SYM - { Lex->only_view= FALSE; } - | TABLES - { Lex->only_view= FALSE; } - | VIEW_SYM - { Lex->only_view= TRUE; } + table_or_tables + | VIEW_SYM { Lex->only_view= TRUE; } ; table_lock_list: |