diff options
| author | sasha@mysql.sashanet.com <> | 2000-10-26 22:11:55 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-10-26 22:11:55 -0600 |
| commit | 75cd25a5794f43ae75cde851fb01ee4c3644c195 (patch) | |
| tree | 1b71072bebf724dd061370737f97c2a08a176ae3 /sql/sql_yacc.yy | |
| parent | c5a1c3c7df0f85deedf6601f9ea01f229e7eb67e (diff) | |
| download | mariadb-git-75cd25a5794f43ae75cde851fb01ee4c3644c195.tar.gz | |
fixed --skip-slave-thread bug
added PURGE MASTER LOGS TO and SHOW MASTER LOGS
fixed the output of SHOW MASTER STATUS
updated docs
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 4b404081676..c647ac8a192 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -107,6 +107,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token MASTER_SYM %token REPAIR %token RESET_SYM +%token PURGE %token SLAVE %token START_SYM %token STOP_SYM @@ -493,7 +494,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %type <NONE> query verb_clause create change select drop insert replace insert2 insert_values update delete show describe load alter optimize flush - reset begin commit rollback slave master_def master_defs + reset purge begin commit rollback slave master_def master_defs repair restore backup analyze check rename field_list field_list_item field_spec kill select_item_list select_item values_list no_braces @@ -549,6 +550,7 @@ verb_clause: | lock | kill | optimize + | purge | rename | repair | replace @@ -2147,6 +2149,10 @@ show_param: if (!add_table_to_list($3,NULL)) YYABORT; } + | MASTER_SYM LOGS_SYM + { + Lex->sql_command = SQLCOM_SHOW_BINLOGS; + } | keys_or_index FROM table_ident opt_db { Lex->sql_command= SQLCOM_SHOW_KEYS; @@ -2246,6 +2252,13 @@ reset_option: SLAVE { Lex->type|= REFRESH_SLAVE; } | MASTER_SYM { Lex->type|= REFRESH_MASTER; } +purge: + PURGE { Lex->sql_command = SQLCOM_PURGE; Lex->type=0;} + MASTER_SYM LOGS_SYM TO_SYM TEXT_STRING + { + Lex->to_log = $6.str; + } + /* kill threads */ kill: |