mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
5426facdcb
- CREATE TABLE is by default executed on the slave as CREATE OR REPLACE - DROP TABLE is by default executed on the slave as DROP TABLE IF NOT EXISTS This means that a slave will by default continue even if we try to create a table that existed on the slave (the table will be deleted and re-created) or if we try to drop a table that didn't exist on the slave. This should be safe as instead of having the slave stop because of an inconsistency between master and slave, it will fix the inconsistency. Those that would prefer to get a stopped slave instead for the above cases can set slave_ddl_exec_mode to STRICT. - Ensure that a CREATE OR REPLACE TABLE which dropped a table is replicated - DROP TABLE that generated an error on master is handled as an identical DROP TABLE on the slave (IF NOT EXISTS is not added in this case) - Added slave_ddl_exec_mode variable to decide how DDL's are replicated New logic for handling BEGIN GTID ... COMMIT from the binary log: - When we find a BEGIN GTID, we start a transaction and set OPTION_GTID_BEGIN - When we find COMMIT, we reset OPTION_GTID_BEGIN and execute the normal COMMIT code. - While OPTION_GTID_BEGIN is set: - We don't generate implict commits before or after statements - All tables are regarded as transactional tables in the binary log (to ensure things are executed exactly as on the master) - We reset OPTION_GTID_BEGIN also on rollback This will help ensuring that we don't get any sporadic commits (and thus new GTID's) on the slave and will help keep the GTID's between master and slave in sync. mysql-test/extra/rpl_tests/rpl_log.test: Added testing of mode slave_ddl_exec_mode=STRICT mysql-test/r/mysqld--help.result: New help messages mysql-test/suite/rpl/r/create_or_replace_mix.result: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/r/create_or_replace_row.result: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/r/create_or_replace_statement.result: Testing replication of create or replace mysql-test/suite/rpl/r/rpl_gtid_startpos.result: Test must be run in slave_ddl_exec_mode=STRICT as part of the test depends on that DROP TABLE should fail on slave. mysql-test/suite/rpl/r/rpl_row_log.result: Updated result mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Updated result mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result: Updated result mysql-test/suite/rpl/r/rpl_stm_log.result: Updated result mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result: Updated result mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result: Updated result mysql-test/suite/rpl/t/create_or_replace.inc: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/t/create_or_replace_mix.cnf: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/t/create_or_replace_mix.test: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/t/create_or_replace_row.cnf: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/t/create_or_replace_row.test: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/t/create_or_replace_statement.cnf: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/t/create_or_replace_statement.test: Testing of CREATE OR REPLACE TABLE with replication mysql-test/suite/rpl/t/rpl_gtid_startpos.test: Test must be run in slave_ddl_exec_mode=STRICT as part of the test depends on that DROP TABLE should fail on slave. mysql-test/suite/rpl/t/rpl_stm_log.test: Removed some lines mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_basic.result: Testing of slave_ddl_exec_mode mysql-test/suite/sys_vars/t/slave_ddl_exec_mode_basic.test: Testing of slave_ddl_exec_mode sql/handler.cc: Regard all tables as transactional in commit if OPTION_GTID_BEGIN is set. This is to ensure that statments are not commited too early if non transactional tables are used. sql/log.cc: Regard all tables as transactional in commit if OPTION_GTID_BEGIN is set. Also treat 'direct' log events as transactional (to get them logged as they where on the master) sql/log_event.cc: Ensure that the new error from DROP TABLE when trying to drop a view is treated same as the old one. Store error code that slave expects in THD. Set OPTION_GTID_BEGIN if we find a BEGIN. Reset OPTION_GTID_BEGIN if we find a COMMIT. sql/mysqld.cc: Added slave_ddl_exec_mode_options sql/mysqld.h: Added slave_ddl_exec_mode_options sql/rpl_gtid.cc: Reset OPTION_GTID_BEGIN if we record a gtid (safety) sql/sql_class.cc: Regard all tables as transactional in commit if OPTION_GTID_BEGIN is set. sql/sql_class.h: Added to THD: log_current_statement and slave_expected_error sql/sql_insert.cc: Ensure that CREATE OR REPLACE is logged if table was deleted. Don't do implicit commit for CREATE if we are under OPTION_GTID_BEGIN sql/sql_parse.cc: Change CREATE TABLE -> CREATE OR REPLACE TABLE for slaves Change DROP TABLE -> DROP TABLE IF EXISTS for slaves CREATE TABLE doesn't force implicit commit in case of OPTION_GTID_BEGIN Don't do commits before or after any statement if OPTION_GTID_BEGIN was set. sql/sql_priv.h: Added OPTION_GTID_BEGIN sql/sql_show.cc: Enhanced store_create_info() to also be able to handle CREATE OR REPLACE sql/sql_show.h: Updated prototype sql/sql_table.cc: Ensure that CREATE OR REPLACE is logged if table was deleted. sql/sys_vars.cc: Added slave_ddl_exec_mode sql/transaction.cc: Added warning if we got a GTID under OPTION_GTID_BEGIN
149 lines
4.9 KiB
Text
149 lines
4.9 KiB
Text
# Requires statement logging
|
|
|
|
# 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).
|
|
sync_slave_with_master;
|
|
source include/stop_slave.inc;
|
|
--source include/wait_for_slave_to_stop.inc
|
|
reset master;
|
|
reset slave;
|
|
start slave;
|
|
--source include/wait_for_slave_to_start.inc
|
|
|
|
let $VERSION=`select version()`;
|
|
# Lets run this test in STRICT MODE (DROP TABLE is not DROP TABLE IF EXISTS)
|
|
connection slave;
|
|
set @save_slave_ddl_exec_mode=@@global.slave_ddl_exec_mode;
|
|
set @@global.slave_ddl_exec_mode=STRICT;
|
|
connection master;
|
|
|
|
eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type;
|
|
insert into t1 values (NULL);
|
|
drop table t1;
|
|
let $LOAD_FILE= ../../std_data/words.dat;
|
|
if (!`SELECT length(load_file('$LOAD_FILE'))`){
|
|
let $LOAD_FILE= ../$LOAD_FILE;
|
|
}
|
|
eval create table t1 (word char(20) not null)ENGINE=$engine_type;
|
|
--replace_result $LOAD_FILE LOAD_FILE
|
|
eval load data infile '$LOAD_FILE' into table t1 ignore 1 lines;
|
|
select count(*) from t1;
|
|
source include/show_binlog_events.inc;
|
|
|
|
let $binlog_limit= 2;
|
|
source include/show_binlog_events.inc;
|
|
|
|
let $binlog_limit= 3;
|
|
source include/show_binlog_events.inc;
|
|
|
|
let $binlog_limit= 2,4;
|
|
source include/show_binlog_events.inc;
|
|
let $binlog_limit=;
|
|
flush logs;
|
|
--source include/wait_for_binlog_checkpoint.inc
|
|
|
|
# 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
|
|
|
|
#show rows of t1 on master
|
|
connection master;
|
|
select * from t1 order by 1 asc;
|
|
|
|
sync_slave_with_master;
|
|
|
|
#check t1 on slave to ensure whether it's identical with on master
|
|
select * from t1 order by 1 asc;
|
|
flush logs;
|
|
source include/stop_slave.inc;
|
|
source include/start_slave.inc;
|
|
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;
|
|
|
|
let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
|
|
source include/show_binlog_events.inc;
|
|
|
|
--replace_column 2 #
|
|
show binary logs;
|
|
sync_slave_with_master;
|
|
--replace_column 2 #
|
|
show binary logs;
|
|
|
|
let $binlog_file=;
|
|
source include/show_binlog_events.inc;
|
|
|
|
let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
|
|
source include/show_binlog_events.inc;
|
|
let $binlog_file=;
|
|
|
|
source include/check_slave_is_running.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
|
|
#
|
|
|
|
# Reset binlog so that show binlog events will not show the tests
|
|
# above.
|
|
source include/rpl_reset.inc;
|
|
connection master;
|
|
|
|
create table t1(a int auto_increment primary key, b int);
|
|
insert into t1 values (NULL, 1);
|
|
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_slave_with_master;
|
|
set @@global.slave_ddl_exec_mode=@save_slave_ddl_exec_mode;
|
|
connection master;
|