diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2011-08-09 12:03:29 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2011-08-09 12:03:29 +0400 |
| commit | dab1c8c4d0a8288df934158abada097db1393a3e (patch) | |
| tree | dc0d028fe3a0c606151fe9522068bfe1a88e8e9e /sql/sql_yacc.yy | |
| parent | 1a9b512d025e3b55c18feaee6afd67297313bb00 (diff) | |
| parent | 337d7935d988fe7ad0336d9dcb7ce9e8eea01af6 (diff) | |
| download | mariadb-git-dab1c8c4d0a8288df934158abada097db1393a3e.tar.gz | |
Manual merge from mysql-5.5.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d8647e74740..6fe9626b11d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -11321,7 +11321,10 @@ flush_option: | STATUS_SYM { Lex->type|= REFRESH_STATUS; } | SLAVE - { Lex->type|= REFRESH_SLAVE; } + { + Lex->type|= REFRESH_SLAVE; + Lex->reset_slave_info.all= false; + } | MASTER_SYM { Lex->type|= REFRESH_MASTER; } | DES_KEY_FILE @@ -11352,10 +11355,16 @@ reset_options: reset_option: SLAVE { Lex->type|= REFRESH_SLAVE; } + slave_reset_options { } | MASTER_SYM { Lex->type|= REFRESH_MASTER; } | QUERY_SYM CACHE_SYM { Lex->type|= REFRESH_QUERY_CACHE;} ; +slave_reset_options: + /* empty */ { Lex->reset_slave_info.all= false; } + | ALL { Lex->reset_slave_info.all= true; } + ; + purge: PURGE { |