mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Post merge fixes. Fixed tests after adding UNTIL conditions
to SHOW SLAVE STATUS. mysql-test/r/rpl000015.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_empty_master_crash.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_error_ignored_table.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_flush_log_loop.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_loaddata.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_log.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_log_pos.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_max_relay_size.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_openssl.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_redirect.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_replicate_do.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_reset_slave.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_rotate_logs.result: Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS mysql-test/r/rpl_until.result: Post merge fix mysql-test/t/rpl_until.test: Post merge fix
This commit is contained in:
@ -13,5 +13,5 @@ master_password='',master_port=SLAVE_PORT;
|
||||
start slave;
|
||||
flush logs;
|
||||
show slave status;
|
||||
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 Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key
|
||||
127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 79 relay-log.000002 4 slave-bin.000001 Yes Yes 0 0 79 4 No
|
||||
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
|
||||
127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 79 relay-log.000002 4 slave-bin.000001 Yes Yes 0 0 79 4 None 0 No
|
||||
|
Reference in New Issue
Block a user