mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
been reached): Post-merge patch to handle all the changes to the tree since the tree was cloned. mysql-test/extra/rpl_tests/rpl_log.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/extra/rpl_tests/rpl_max_relay_size.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/extra/rpl_tests/rpl_reset_slave.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/include/show_slave_status.inc: Column change. mysql-test/r/rpl_000015.result: Result file change. mysql-test/r/rpl_change_master.result: Result file change. mysql-test/r/rpl_empty_master_crash.result: Result file change. mysql-test/r/rpl_extraCol_innodb.result: Result file change. mysql-test/r/rpl_extraCol_myisam.result: Result file change. mysql-test/r/rpl_flushlog_loop.result: Result file change. mysql-test/r/rpl_incident.result: Result file change. mysql-test/r/rpl_known_bugs_detection.result: Result file change. mysql-test/r/rpl_loaddata.result: Result file change. mysql-test/r/rpl_loaddata_fatal.result: Result file change. mysql-test/r/rpl_log_pos.result: Result file change. mysql-test/r/rpl_ndb_basic.result: Result file change. mysql-test/r/rpl_ndb_circular.result: Result file change. mysql-test/r/rpl_ndb_extraCol.result: Result file change. mysql-test/r/rpl_ndb_idempotent.result: Result file change. mysql-test/r/rpl_ndb_log.result: Result file change. mysql-test/r/rpl_ndb_sync.result: Result file change. mysql-test/r/rpl_rbr_to_sbr.result: Result file change. mysql-test/r/rpl_redirect.result: Result file change. mysql-test/r/rpl_replicate_do.result: Result file change. mysql-test/r/rpl_rotate_logs.result: Result file change. mysql-test/r/rpl_row_inexist_tbl.result: Result file change. mysql-test/r/rpl_row_log.result: Result file change. mysql-test/r/rpl_row_log_innodb.result: Result file change. mysql-test/r/rpl_row_max_relay_size.result: Result file change. mysql-test/r/rpl_row_reset_slave.result: Result file change. mysql-test/r/rpl_row_tabledefs_2myisam.result: Result file change. mysql-test/r/rpl_row_tabledefs_3innodb.result: Result file change. mysql-test/r/rpl_row_until.result: Result file change. mysql-test/r/rpl_server_id1.result: Result file change. mysql-test/r/rpl_server_id2.result: Result file change. mysql-test/r/rpl_slave_skip.result: Result file change. mysql-test/r/rpl_ssl.result: Result file change. mysql-test/r/rpl_ssl1.result: Result file change. mysql-test/r/rpl_stm_log.result: Result file change. mysql-test/r/rpl_stm_max_relay_size.result: Result file change. mysql-test/r/rpl_stm_reset_slave.result: Result file change. mysql-test/r/rpl_stm_until.result: Result file change. mysql-test/t/rpl_000015.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/t/rpl_change_master.test: Column position change. Making result of SHOW SLAVE STATUS vertical. mysql-test/t/rpl_empty_master_crash.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/t/rpl_log_pos.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/t/rpl_ndb_basic.test: Column position change. mysql-test/t/rpl_ndb_idempotent.test: Column position change. mysql-test/t/rpl_ndb_sync.test: Column position change. Making result of SHOW SLAVE STATUS vertical. mysql-test/t/rpl_redirect.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/t/rpl_replicate_do.test: Column position change. Making result of SHOW SLAVE STATUS vertical. mysql-test/t/rpl_rotate_logs.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/t/rpl_row_inexist_tbl.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/t/rpl_row_until.test: Replacing SHOW SLAVE STATUS with include file. mysql-test/t/rpl_server_id1.test: Column position change. Making result of SHOW SLAVE STATUS vertical. mysql-test/t/rpl_server_id2.test: Column position change. Making result of SHOW SLAVE STATUS vertical. mysql-test/t/rpl_slave_status.test: Column position change. mysql-test/t/rpl_ssl.test: Column position change. mysql-test/t/rpl_ssl1.test: Column position change. mysql-test/t/rpl_stm_until.test: Replacing SHOW SLAVE STATUS with include file. sql/log_event.cc: Using member function last_error() instead of member variable. Replacing use of 'table' with 'm_table'. Suppressing warnings in debug printout. Setting thd->net.last_error on error return from unpack_row() to get a non-zero error message. The error codes for are being harmonized in another worklog. Replacing use of slave_print_msg() with RELAY_LOG_INFO::report(). sql/rpl_mi.h: Moving order of include files since they are dependent (!). sql/rpl_record.cc: Adding missing include file. Replacing use of slave_print_msg() with RELAY_LOG_INFO::report(). sql/rpl_record_old.cc: Adding missing include file. Replacing use of slave_print_msg() with RELAY_LOG_INFO::report(). sql/rpl_reporting.cc: Adding const modifier to member function. Using renamed member variable m_last_error. sql/rpl_reporting.h: Adding missing constant MAX_SLAVE_ERRMSG. Adding const modifier to Slave_reporting_capability::report(). Hiding and renaming member variable last_error and incorporating member function for access in order to make it mutable. sql/rpl_rli.h: Moving constant MAX_SLAVE_ERRMSG. sql/rpl_utility.cc: Adding missing include file rpl_rli.h. sql/slave.cc: Replacing use of member variable last_error with call to member function last_error(). Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
148 lines
5.6 KiB
Plaintext
148 lines
5.6 KiB
Plaintext
# Requires statement logging
|
|
-- source include/master-slave.inc
|
|
|
|
# Clean up old slave's binlogs.
|
|
# The slave is started with --log-slave-updates
|
|
# and this test does SHOW BINLOG EVENTS on the slave's
|
|
# binlog. But previous tests can influence the current test's
|
|
# binlog (e.g. a temporary table in the previous test has not
|
|
# been explicitly deleted, and at the beginning of the current
|
|
# test the slave immediately writes DROP TEMPORARY TABLE this_old_table).
|
|
# We wait for the slave to have written all he wants to the binlog
|
|
# (otherwise RESET MASTER may come too early).
|
|
save_master_pos;
|
|
connection slave;
|
|
sync_with_master;
|
|
stop slave;
|
|
reset master;
|
|
reset slave;
|
|
# We are going to read the slave's binlog which contains file_id (for some LOAD
|
|
# DATA INFILE); to make it repeatable (not influenced by other tests), we need
|
|
# to stop and start the slave, to be sure file_id will start from 1.
|
|
# This can be done with 'server_stop slave', but
|
|
# this would require the manager, so most of the time the test will be skipped
|
|
# :(
|
|
# To workaround this, I (Guilhem) add a (empty) rpl_log-slave.opt (because when
|
|
# mysql-test-run finds such a file it restarts the slave before doing the
|
|
# test). That's not very elegant but I could find no better way, sorry.
|
|
|
|
let $VERSION=`select version()`;
|
|
|
|
connection master;
|
|
reset master;
|
|
eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type;
|
|
insert into t1 values (NULL);
|
|
drop table t1;
|
|
eval create table t1 (word char(20) not null)ENGINE=$engine_type;
|
|
load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
|
|
select count(*) from t1;
|
|
--replace_result $VERSION VERSION
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
|
|
show binlog events;
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
|
|
show binlog events from 106 limit 1;
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
|
|
show binlog events from 106 limit 2;
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
|
|
show binlog events from 106 limit 2,1;
|
|
flush logs;
|
|
|
|
# We need an extra update before doing save_master_pos.
|
|
# Otherwise, an unlikely scenario may occur:
|
|
# * When the master's binlog_dump thread reads the end of master-bin.001,
|
|
# it send the rotate event which is at this end, plus a fake rotate event
|
|
# because it's starting to read a new binlog.
|
|
# save_master_pos will record the position of the first of the two rotate
|
|
# (because the fake one is not in the master's binlog anyway).
|
|
# * Later the slave waits for the position of the first rotate event,
|
|
# and it may quickly stop (in 'slave stop') without having received the fake
|
|
# one.
|
|
# So, depending on a few milliseconds, we end up with 2 rotate events in the
|
|
# relay log or one, which influences the output of SHOW SLAVE STATUS, making
|
|
# it not predictable and causing random test failures.
|
|
# To make it predictable, we do a useless update now, but which has the
|
|
# interest of making the slave catch both rotate events.
|
|
|
|
eval create table t3 (a int)ENGINE=$engine_type;
|
|
|
|
# Sync slave and force it to start on another binary log
|
|
|
|
save_master_pos;
|
|
connection slave;
|
|
# Note that the above 'slave start' will cause a 3rd rotate event (a fake one)
|
|
# to go into the relay log (the master always sends a fake one when replication
|
|
# starts).
|
|
start slave;
|
|
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%';
|
|
--source include/wait_slave_status.inc
|
|
sync_with_master;
|
|
flush logs;
|
|
stop slave;
|
|
connection master;
|
|
|
|
# Create some entries for second log
|
|
|
|
eval create table t2 (n int)ENGINE=$engine_type;
|
|
insert into t2 values (1);
|
|
source include/show_binlog_events.inc;
|
|
--replace_result $VERSION VERSION
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
|
|
show binlog events in 'master-bin.000002';
|
|
show binary logs;
|
|
save_master_pos;
|
|
connection slave;
|
|
start slave;
|
|
sync_with_master;
|
|
show binary logs;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
|
|
show binlog events in 'slave-bin.000001' from 4;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
|
|
--replace_column 2 # 5 #
|
|
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
|
|
show binlog events in 'slave-bin.000002' from 4;
|
|
source include/show_slave_status.inc;
|
|
|
|
# Need to recode the following
|
|
|
|
#show new master for slave with master_log_file='master-bin.000001' and master_log_pos=4 and master_server_id=1;
|
|
#show new master for slave with master_log_file='master-bin.000001' and master_log_pos=79 and master_server_id=1;
|
|
#show new master for slave with master_log_file='master-bin.000001' and master_log_pos=311 and master_server_id=1;
|
|
#show new master for slave with master_log_file='master-bin.000002' and master_log_pos=4 and master_server_id=1;
|
|
#show new master for slave with master_log_file='master-bin.000002' and master_log_pos=122 and master_server_id=1;
|
|
|
|
--error 1220
|
|
show binlog events in 'slave-bin.000005' from 4;
|
|
|
|
connection master;
|
|
|
|
# The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here.
|
|
|
|
DROP TABLE t1;
|
|
DROP TABLE t2;
|
|
DROP TABLE t3;
|
|
|
|
#
|
|
# Bug #6880: LAST_INSERT_ID() within a statement
|
|
#
|
|
|
|
create table t1(a int auto_increment primary key, b int);
|
|
insert into t1 values (NULL, 1);
|
|
reset master;
|
|
set insert_id=5;
|
|
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
|
|
source include/show_binlog_events.inc;
|
|
select * from t1;
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|
|
|
|
sync_with_master;
|
|
|