database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.

Browse Source 
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.


mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/t/rpl_rotate_logs.test:
  added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to
  PURGE MASTER LOGS.
sql/sql_yacc.yy:
  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.
This commit is contained in:
unknown
2003-07-12 23:31:21 +02:00
parent d1d636de8f
commit 19a4a84dbc
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/rpl_rotate_logs.result
View File

@ -41,11 +41,16 @@ insert into t2 values(NULL);
set global sql_slave_skip_counter=1; set global sql_slave_skip_counter=1;
start slave; start slave;
purge master logs to 'master-bin.000002'; purge master logs to 'master-bin.000002';
show master logs;
Log_name
master-bin.000002
master-bin.000003
purge binary logs to 'master-bin.000002';
show binary logs; show binary logs;
Log_name Log_name
master-bin.000002 master-bin.000002
master-bin.000003 master-bin.000003
purge logs before now(); purge master logs before now();
show binary logs; show binary logs;
Log_name Log_name
master-bin.000003 master-bin.000003

5
mysql-test/t/rpl_rotate_logs.test
View File

@ -90,9 +90,12 @@ connection master;
sync_slave_with_master; sync_slave_with_master;
connection master; connection master;
purge master logs to 'master-bin.000002'; purge master logs to 'master-bin.000002';
show master logs;
# we just tests if synonyms are accepted
purge binary logs to 'master-bin.000002';
show binary logs; show binary logs;
--sleep 1; --sleep 1;
purge logs before now(); purge master logs before now();
show binary logs; show binary logs;
insert into t2 values (65); insert into t2 values (65);
sync_slave_with_master; sync_slave_with_master;

11
sql/sql_yacc.yy
View File

@ -3742,7 +3742,7 @@ show_param:
Lex->mi.pos = $12; Lex->mi.pos = $12;
Lex->mi.server_id = $16; Lex->mi.server_id = $16;
} }
| BINARY LOGS_SYM | master_or_binary LOGS_SYM
{ {
Lex->sql_command = SQLCOM_SHOW_BINLOGS; Lex->sql_command = SQLCOM_SHOW_BINLOGS;
} }
@ -3802,6 +3802,8 @@ show_param:
{ Lex->sql_command= SQLCOM_SHOW_CHARSETS; } { Lex->sql_command= SQLCOM_SHOW_CHARSETS; }
| COLLATION_SYM wild | COLLATION_SYM wild
{ Lex->sql_command= SQLCOM_SHOW_COLLATIONS; } { Lex->sql_command= SQLCOM_SHOW_COLLATIONS; }
| BERKELEY_DB_SYM LOGS_SYM
{ Lex->sql_command= SQLCOM_SHOW_LOGS; }
| LOGS_SYM | LOGS_SYM
{ Lex->sql_command= SQLCOM_SHOW_LOGS; } { Lex->sql_command= SQLCOM_SHOW_LOGS; }
| GRANTS FOR_SYM user | GRANTS FOR_SYM user
@ -3832,6 +3834,10 @@ show_param:
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT; Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
}; };
master_or_binary:
MASTER_SYM
| BINARY;
opt_db: opt_db:
/* empty */ { $$= 0; } /* empty */ { $$= 0; }
| from_or_in ident { $$= $2.str; }; | from_or_in ident { $$= $2.str; };
@ -3949,8 +3955,7 @@ purge:
; ;
purge_options: purge_options:
LOGS_SYM purge_option master_or_binary LOGS_SYM purge_option
| MASTER_SYM LOGS_SYM purge_option
; ;
purge_option: purge_option: