• unknown's avatar
    Bug #49741 test files contain explicit references to bin/relay-log positions · e78da462
    unknown authored
    Some of the test cases reference to binlog position and
    these position numbers are written into result explicitly.
    It is difficult to maintain if log event format changes. 
    
    There are a couple of cases explicit position number appears, 
    we handle them in different ways
    A. 'CHANGE MASTER ...' with MASTER_LOG_POS or/and RELAY_LOG_POS options
       Use --replace_result to mask them.
    B. 'SHOW BINLOG EVENT ...'
       Replaced by show_binlog_events.inc or wait_for_binlog_event.inc. 
       show_binlog_events.inc file's function is enhanced by given
       $binlog_file and $binlog_limit.
    C. 'SHOW SLAVE STATUS', 'show_slave_status.inc' and 'show_slave_status2.inc'
       For the test cases just care a few items in the result of 'SHOW SLAVE STATUS',
       only the items related to each test case are showed.
       'show_slave_status.inc' is rebuild, only the given items in $status_items
       will be showed.
       'check_slave_is_running.inc' and 'check_slave_no_error.inc'
       and 'check_slave_param.inc' are auxiliary files helping
       to show running status and error information easily.
    
    
    mysql-test/extra/binlog_tests/binlog.test:
      It only cares whether current binlog file index is changed, so it is ok
      with 'show_master_status.inc' instead of 'show mater status'.
    mysql-test/extra/binlog_tests/blackhole.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/extra/rpl_tests/rpl_deadlock.test:
      Use 'check_slave_is_running.inc' instead of 'show_slave_status2.inc'.
    mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
      Use 'wait_for_slave_sql_error.inc' and 'ait_for_slave_sql_error_and_skip.inc' instead of 'show slave status'.
    mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test:
      It is need now to give a error number, so use 'wait_for_slave_io_to_stop.inc'
      instead of 'wait_for_slave_io_error.inc'.
    mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/extra/rpl_tests/rpl_log.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
      se 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
      se 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/extra/rpl_tests/rpl_reset_slave.test:
      Use 'show_slave_status.inc' instead of 'show_slave_status2.inc' statement.
      Use 'check_slave_no_error.inc' to simplify the check that there is no error.
    mysql-test/extra/rpl_tests/rpl_row_basic.test:
      Use 'check_slave_is_running.inc' to verify that Slave threads are running well.
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
    mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
      Use 'show_slave_error_status_and_skip.inc' instead of 'show slave status'.
    mysql-test/include/check_slave_is_running.inc:
      To make sure both sql and io thread are running well. If not, the test will be aborted.
    mysql-test/include/check_slave_no_error.inc:
      To make sure both sql and io thread have no error. If not, the test will be aborted.
    mysql-test/include/get_relay_log_pos.inc:
      According to the position of a log event in master binlog file,
      find the peer position of a log event in relay log file.
    mysql-test/include/rpl_stmt_seq.inc:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/include/show_binlog_events.inc:
      Add two options $binlog_file and $binlog_limit for showing binlog events from different binlog files or/and given different limits on position or row number.
    mysql-test/include/show_rpl_debug_info.inc:
      Add 'SELECT NOW()' in the debug information.
    mysql-test/include/show_slave_status.inc:
      It's more clean and tidy Only the given columns of slave status are printed.
    mysql-test/include/test_fieldsize.inc:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave stutus'.
    mysql-test/include/wait_for_binlog_event.inc:
      Use show_rpl_debug_info.inc instead of 'SHOW BINLOG EVENTS'.
    mysql-test/include/wait_for_slave_io_error.inc:
      Add $slave_io_errno and $show_slave_io_error, it waits only a given error.
    mysql-test/include/wait_for_slave_param.inc:
      Use die instead of exit.
    mysql-test/include/wait_for_slave_sql_error.inc:
      Add $slave_sql_errno and $show_slave_sql_error, it waits only a given error.
    mysql-test/include/wait_for_status_var.inc:
      Use die instead of exit.
    mysql-test/r/flush_block_commit_notembedded.result:
      It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'.
    mysql-test/r/multi_update.result:
      It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'.
    mysql-test/suite/binlog/r/binlog_innodb.result:
      It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'.
    mysql-test/suite/binlog/r/binlog_row_binlog.result:
      Position in the result of 'show master status' is replaced by '#'.
    mysql-test/suite/binlog/r/binlog_stm_binlog.result:
      Position in the result of 'show master status' is replaced by '#'.
    mysql-test/suite/binlog/t/binlog_innodb.test:
      It checks whether somethings are binlogged, so we use 'show_binlog_event.inc' instead of 'show master status'.
    mysql-test/suite/binlog/t/binlog_stm_binlog.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/bugs/r/rpl_bug36391.result:
      Position in the result of 'show master status' is replaced by '#'.
    mysql-test/suite/bugs/t/rpl_bug12691.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/bugs/t/rpl_bug36391.test:
      'show master status' is replaced by 'show_master_status.inc'.
      Position in the result of 'show master status' is replaced by '#'.
    mysql-test/suite/engines/funcs/r/rpl_000015.result:
      It checks whether somethings are binlogged, 
      so we using 'show_binlog_event.inc' instead of 'show master status'.
    mysql-test/suite/engines/funcs/t/rpl_000015.test:
      Use 'check_slave_is_running.inc' to verify that Slave threads are running well.
    mysql-test/suite/engines/funcs/t/rpl_REDIRECT.test:
      Use 'query_vertical SHOW SLAVE STATUS' instead of 'show slave status'.
      There is no status columns in the result file, for no slave exists on master's server.
    mysql-test/suite/engines/funcs/t/rpl_change_master.test:
      This test just care whether Read_Master_Log_Pos is equal to Exec_Master_Log_Pos after 'CHANGE MASTER ..'. So 'show slave status' is removed and just check the value of Read_Master_Log_Pos and Exec_Master_Log_Pos.
    mysql-test/suite/engines/funcs/t/rpl_empty_master_crash.test:
      We doesn't really need the statement.
    mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test:
      Just show Relay_Log_File, running status and error informations.
      Use 'check_slave_is_running.inc' to verify that Slave threads are running well.
    mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/engines/funcs/t/rpl_log_pos.test:
      Mask the explicit positions in the result file.
      Use 'check_slave_no_error.inc' to simplify the check that there is no error.
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave stutus'.
    mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/engines/funcs/t/rpl_row_drop.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave stutus'.
    mysql-test/suite/engines/funcs/t/rpl_row_until.test:
      Use 'check_slave_param.inc' to check whether SQL Thread stop at a right position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements.
      
      Mask the explicit binary log positions in the result file.
    mysql-test/suite/engines/funcs/t/rpl_server_id1.test:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave stutus'.
      Use 'check_slave_no_error.inc' to simplify the check that there is no error.
    mysql-test/suite/engines/funcs/t/rpl_server_id2.test:
      It doesn't really need in this test.
    mysql-test/suite/engines/funcs/t/rpl_slave_status.test:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave stutus'.
    mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/manual/t/rpl_replication_delay.test:
      Use 'show_slave_status.inc' instead of 'show slave status'.
    mysql-test/suite/parts/t/rpl_partition.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/rpl/t/rpl_000015.test:
      Use 'show_slave_status.inc' instead of 'show_slave_status2.inc'.
    mysql-test/suite/rpl/t/rpl_binlog_grant.test:
      Use 'wait_for_binlog_event.inc' instead of 'show binlog events' statement.
    mysql-test/suite/rpl/t/rpl_bug33931.test:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave stutus'.
    mysql-test/suite/rpl/t/rpl_change_master.test:
      This test just care whether Read_Master_Log_Pos is equal to Exec_Master_Log_Pos after 'CHANGE MASTER ..'. So 'show slave status' is removed and just check the value of Read_Master_Log_Pos and Exec_Master_Log_Pos.
    mysql-test/suite/rpl/t/rpl_critical_errors.test:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave stutus'.
    mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
      Mask the explicit position numbers in result file.
      It is restricted running on SBR, for it want to binlog 'set @A=1' statement.
    mysql-test/suite/rpl/t/rpl_empty_master_crash.test:
      It doesn't need in this test.
    mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
      UUse 'check_slave_is_running.inc' and 'show_slave_status.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test:
      Use 'wait_for_slave_io_error.inc' to wait the given io thread error happening.
    mysql-test/suite/rpl/t/rpl_grant.test:
      It doesn't need in this test.
    mysql-test/suite/rpl/t/rpl_incident.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl/t/rpl_known_bugs_detection.test:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave stutus'.
    mysql-test/suite/rpl/t/rpl_loaddata_fatal.test:
      Use 'wait_for_slave_sql_error_and_skip.inc' to wait the given sql thread error happening and then skip the event. There is no need to print the result of 'show slave stutus'.
    mysql-test/suite/rpl/t/rpl_log_pos.test:
      Use 'wait_for_slave_io_error.inc' to wait the given io thread error happening.
      There is no need to print the result of 'show slave status'.
    mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/rpl/t/rpl_replicate_do.test:
      Use 'show_slave_status.inc' instead of 'show slave status'.
    mysql-test/suite/rpl/t/rpl_rotate_logs.test:
      Use 'show_slave_status.inc' instead of 'show_slave_status2.inc'.
    mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/rpl/t/rpl_row_create_table.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/rpl/t/rpl_row_drop.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/rpl/t/rpl_row_until.test:
      Use 'check_slave_param.inc' to check whether SQL Thread stop at a right position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements.
    mysql-test/suite/rpl/t/rpl_skip_error.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave status'.
    mysql-test/suite/rpl/t/rpl_slave_skip.test:
      Use 'check_slave_param.inc' to check whether SQL Thread stop at a right position, and mask the explicit position number in the 'CHANGE MASTER' statements.
    mysql-test/suite/rpl/t/rpl_sp.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/suite/rpl/t/rpl_ssl.test:
      Use 'show_slave_status.inc' instead of 'show slave status'.
    mysql-test/suite/rpl/t/rpl_ssl1.test:
      Use 'show_slave_status.inc' instead of 'show slave status'.
    mysql-test/suite/rpl/t/rpl_stm_until.test:
      Use 'check_slave_param.inc' to check whether SQL Thread stop at a right position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements.
    mysql-test/suite/rpl/t/rpl_temporary_errors.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
      Use 'wait_for_slave_sql_error.inc' to wait the given sql thread error happening.
      There is no need to print the result of 'show slave status'.
    mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test:
      Mask master_log_pos and master_log_file
    mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test:
      Use 'check_slave_is_running.inc' instead of 'show slave status' statement.
    mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/t/alter_table-big.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/t/create-big.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/t/ctype_cp932_binlog_stm.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    mysql-test/t/flush_block_commit_notembedded.test:
      It checks whether somethings are binlogged, 
      so we using 'show_binlog_event.inc' instead of 'show master status'.
    mysql-test/t/multi_update.test:
      It checks whether somethings are binlogged, 
      so we using 'wait_binlog_event.inc' instead of 'show master status'.
    mysql-test/t/sp_trans_log.test:
      Use 'show_binlog_events.inc' instead of 'show binlog events' statement.
    e78da462
rpl_row_until.test 3.42 KB
-- source include/not_ndb_default.inc
-- source include/have_binlog_format_row.inc
-- source include/master-slave.inc

# Test is dependent on binlog positions

# prepare version for substitutions
let $VERSION=`select version()`;

# stop slave before he will start replication also sync with master
# for avoiding undetermenistic behaviour
save_master_pos;
connection slave;
sync_with_master;
stop slave;

connection master;
# create some events on master
create table t1(n int not null auto_increment primary key);
insert into t1 values (1),(2),(3),(4);
let $master_log_pos_1= query_get_value(SHOW MASTER STATUS, Position, 1);
drop table t1;

create table t2(n int not null auto_increment primary key);
insert into t2 values (1),(2);
let $master_log_pos_2= query_get_value(SHOW MASTER STATUS, Position, 1);
insert into t2 values (3),(4);
drop table t2;

# try to replicate all queries until drop of t1
connection slave;
--replace_result $master_log_pos_1 MASTER_LOG_POS
eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_log_pos_1;
sleep 2;
wait_for_slave_to_stop;
# here table should be still not deleted
select * from t1;
--let $slave_param= Exec_Master_Log_Pos
--let $slave_param_value= $master_log_pos_1
--source include/check_slave_param.inc

# this should fail right after start
--replace_result 291 MASTER_LOG_POS
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
# again this table should be still not deleted
select * from t1;
sleep 2;
wait_for_slave_to_stop;
--let $slave_param= Exec_Master_Log_Pos
--let $slave_param_value= $master_log_pos_1
--source include/check_slave_param.inc

# try replicate all up to and not including the second insert to t2;
let $master_log_pos= $master_log_pos_2;
let $relay_log_file= slave-relay-bin.000004;
--source include/get_relay_log_pos.inc
--replace_result $relay_log_pos RELAY_LOG_POS
eval start slave until relay_log_file='$relay_log_file', relay_log_pos=$relay_log_pos;
sleep 2;
wait_for_slave_to_stop;
select * from t2;
--let $slave_param= Exec_Master_Log_Pos
--let $slave_param_value= $master_log_pos
--source include/check_slave_param.inc

# clean up
start slave;
connection master;
save_master_pos;
connection slave;
sync_with_master;
stop slave;

--let $exec_log_pos_1= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1)
# this should stop immediately as we are already there
--replace_result $master_log_pos_2 MASTER_LOG_POS
eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_log_pos_2;
sleep 2;
wait_for_slave_to_stop;
# here the sql slave thread should be stopped
--let $slave_param= Exec_Master_Log_Pos
--let $slave_param_value= $exec_log_pos_1
--source include/check_slave_param.inc

#testing various error conditions
--replace_result 561 MASTER_LOG_POS
--error 1277
start slave until master_log_file='master-bin', master_log_pos=561;
--replace_result 561 MASTER_LOG_POS 12 RELAY_LOG_POS
--error 1277
start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
--error 1277
start slave until master_log_file='master-bin.000001';
--error 1277
start slave until relay_log_file='slave-relay-bin.000002';
--replace_result 561 MASTER_LOG_POS
--error 1277
start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
# Warning should be given for second command
start slave sql_thread;
--replace_result 740 MASTER_LOG_POS
start slave until master_log_file='master-bin.000001', master_log_pos=740;