diff options
| author | guilhem@gbichot2 <> | 2003-07-12 23:31:21 +0200 |
|---|---|---|
| committer | guilhem@gbichot2 <> | 2003-07-12 23:31:21 +0200 |
| commit | 3110561e5df13003d74da58b57e9babc42dbd450 (patch) | |
| tree | 43d6e44dc77ea94edd9a4eb8b30dd336f082113e /sql/sql_yacc.yy | |
| parent | c994482fadd709639073ad2414d6362fa9987adb (diff) | |
| download | mariadb-git-3110561e5df13003d74da58b57e9babc42dbd450.tar.gz | |
Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3098bd18b2d..c836cb414e0 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3742,7 +3742,7 @@ show_param: Lex->mi.pos = $12; Lex->mi.server_id = $16; } - | BINARY LOGS_SYM + | master_or_binary LOGS_SYM { Lex->sql_command = SQLCOM_SHOW_BINLOGS; } @@ -3802,6 +3802,8 @@ show_param: { Lex->sql_command= SQLCOM_SHOW_CHARSETS; } | COLLATION_SYM wild { Lex->sql_command= SQLCOM_SHOW_COLLATIONS; } + | BERKELEY_DB_SYM LOGS_SYM + { Lex->sql_command= SQLCOM_SHOW_LOGS; } | LOGS_SYM { Lex->sql_command= SQLCOM_SHOW_LOGS; } | GRANTS FOR_SYM user @@ -3832,6 +3834,10 @@ show_param: Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT; }; +master_or_binary: + MASTER_SYM + | BINARY; + opt_db: /* empty */ { $$= 0; } | from_or_in ident { $$= $2.str; }; @@ -3949,8 +3955,7 @@ purge: ; purge_options: - LOGS_SYM purge_option - | MASTER_SYM LOGS_SYM purge_option + master_or_binary LOGS_SYM purge_option ; purge_option: |