mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 08:44:33 +01:00
abbf5941d9
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().
92 lines
2.2 KiB
Text
92 lines
2.2 KiB
Text
# This test assumes we are ignoring updates on table t2, but doing
|
|
# updates on t1
|
|
source include/master-slave.inc;
|
|
--disable_warnings
|
|
drop table if exists t11;
|
|
connection slave;
|
|
drop table if exists t11;
|
|
--enable_warnings
|
|
|
|
create table t2 (n int);
|
|
insert into t2 values(4);
|
|
connection master;
|
|
create table t2 (s char(20));
|
|
load data infile '../std_data_ln/words.dat' into table t2;
|
|
insert into t2 values('five');
|
|
create table t1 (m int);
|
|
insert into t1 values(15),(16),(17);
|
|
update t1 set m=20 where m=16;
|
|
delete from t1 where m=17;
|
|
create table t11 select * from t1;
|
|
save_master_pos;
|
|
connection slave;
|
|
sync_with_master;
|
|
select * from t1 ORDER BY m;
|
|
select * from t2;
|
|
--error 1146
|
|
select * from t11;
|
|
connection master;
|
|
drop table if exists t1,t2,t11;
|
|
save_master_pos;
|
|
connection slave;
|
|
sync_with_master;
|
|
# show slave status, just to see of it prints replicate-do-table
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
|
|
query_vertical SHOW SLAVE STATUS;
|
|
|
|
#
|
|
# BUG#12542
|
|
# TEST: "SET ONE_SHOT should always be executed on slave"
|
|
#
|
|
# We could use any timezone different than server default in this test
|
|
#
|
|
connection master;
|
|
create table t1 (ts timestamp);
|
|
set one_shot time_zone='met';
|
|
insert into t1 values('2005-08-12 00:00:00');
|
|
set one_shot time_zone='met';
|
|
select * from t1;
|
|
sync_slave_with_master;
|
|
|
|
connection slave;
|
|
set one_shot time_zone='met';
|
|
select * from t1;
|
|
|
|
connection master;
|
|
drop table t1;
|
|
sync_slave_with_master;
|
|
|
|
# End of 4.1 tests
|
|
|
|
#
|
|
# Bug#24478 DROP TRIGGER is not caught by replicate-*-table filters
|
|
#
|
|
--echo *** master ***
|
|
connection master;
|
|
create table t1 (a int, b int);
|
|
create trigger trg1 before insert on t1 for each row set new.b=2;
|
|
create table t2 (a int, b int);
|
|
create trigger trg2 before insert on t2 for each row set new.b=2;
|
|
show tables;
|
|
show triggers;
|
|
sync_slave_with_master;
|
|
--echo *** slave ***
|
|
connection slave;
|
|
show tables;
|
|
show triggers;
|
|
--echo *** master ***
|
|
connection master;
|
|
drop trigger trg1;
|
|
drop trigger trg2;
|
|
show triggers;
|
|
sync_slave_with_master;
|
|
--echo *** slave ***
|
|
connection slave;
|
|
show tables;
|
|
show triggers;
|
|
--echo *** master ***
|
|
connection master;
|
|
drop table t1;
|
|
drop table t2;
|
|
sync_slave_with_master;
|