mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
Use same style for SHOW MASTER STATUS fields as
for SHOW SLAVE STATUS.
This commit is contained in:
parent
8a8fef225d
commit
c9a9fa8e47
7 changed files with 10 additions and 10 deletions
|
@ -1,6 +1,6 @@
|
|||
reset master;
|
||||
show master status;
|
||||
File Position Binlog_do_db Binlog_ignore_db
|
||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||
master-bin.000001 79
|
||||
reset slave;
|
||||
show slave status;
|
||||
|
|
|
@ -21,7 +21,7 @@ day id category name
|
|||
2003-03-22 2161 c asdf
|
||||
2003-03-22 2416 a bbbbb
|
||||
show master status;
|
||||
File Position Binlog_do_db Binlog_ignore_db
|
||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||
slave-bin.000001 964
|
||||
drop table t1;
|
||||
drop table t2;
|
||||
|
@ -63,6 +63,6 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
|
|||
'\n##\n' starting by '>' ignore 1 lines;
|
||||
ERROR 23000: Duplicate entry '2003-03-22' for key 1
|
||||
show master status;
|
||||
File Position Binlog_do_db Binlog_ignore_db
|
||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||
master-bin.000001 491
|
||||
drop table t2;
|
||||
|
|
|
@ -5,7 +5,7 @@ reset slave;
|
|||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
start slave;
|
||||
show master status;
|
||||
File Position Binlog_do_db Binlog_ignore_db
|
||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||
master-bin.000001 79
|
||||
show slave status;
|
||||
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
|
||||
|
@ -29,7 +29,7 @@ show slave status;
|
|||
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
|
||||
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 173 slave-relay-bin.000001 4 master-bin.000001 No Yes 0 0 173 4 None 0 No #
|
||||
show master status;
|
||||
File Position Binlog_do_db Binlog_ignore_db
|
||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||
master-bin.000001 79
|
||||
create table if not exists t1 (n int);
|
||||
drop table if exists t1;
|
||||
|
|
|
@ -57,5 +57,5 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File
|
|||
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 50583 slave-relay-bin.000010 52 master-bin.000001 Yes Yes 0 0 50583 52 None 0 No #
|
||||
flush logs;
|
||||
show master status;
|
||||
File Position Binlog_do_db Binlog_ignore_db
|
||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||
master-bin.000002 4
|
||||
|
|
|
@ -74,7 +74,7 @@ Log_name
|
|||
master-bin.000003
|
||||
master-bin.000004
|
||||
show master status;
|
||||
File Position Binlog_do_db Binlog_ignore_db
|
||||
File Position Binlog_Do_DB Binlog_Ignore_DB
|
||||
master-bin.000004 2886
|
||||
select * from t4;
|
||||
a
|
||||
|
|
|
@ -254,7 +254,7 @@ static int find_target_pos(LEX_MASTER_INFO *mi, IO_CACHE *log, char *errmsg)
|
|||
it is reworked. Event's log_pos used to be preserved through
|
||||
log-slave-updates to make code in repl_failsafe.cc work (this
|
||||
function, SHOW NEW MASTER); but on the other side it caused unexpected
|
||||
values in Exec_master_log_pos in A->B->C replication setup,
|
||||
values in Exec_Master_Log_Pos in A->B->C replication setup,
|
||||
synchronization problems in master_pos_wait(), ... So we
|
||||
(Dmitri & Guilhem) removed it.
|
||||
|
||||
|
|
|
@ -1251,8 +1251,8 @@ int show_binlog_info(THD* thd)
|
|||
field_list.push_back(new Item_empty_string("File", FN_REFLEN));
|
||||
field_list.push_back(new Item_return_int("Position",20,
|
||||
MYSQL_TYPE_LONGLONG));
|
||||
field_list.push_back(new Item_empty_string("Binlog_do_db",255));
|
||||
field_list.push_back(new Item_empty_string("Binlog_ignore_db",255));
|
||||
field_list.push_back(new Item_empty_string("Binlog_Do_DB",255));
|
||||
field_list.push_back(new Item_empty_string("Binlog_Ignore_DB",255));
|
||||
|
||||
if (protocol->send_fields(&field_list, 1))
|
||||
DBUG_RETURN(-1);
|
||||
|
|
Loading…
Add table
Reference in a new issue