mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
96a51b7f39
without PK Bug#31609 Not all RBR slave errors reported as errors bug#32468 delete rows event on a table with foreign key constraint fails The first two bugs comprise idempotency issues. First, there was no error code reported under conditions of the bug description although the slave sql thread halted. Second, executions were different with and without presence of prim key in the table. Third, there was no way to instruct the slave whether to ignore an error and skip to the following event or to halt. Fourth, there are handler errors which might happen due to idempotent applying of binlog but those were not listed among the "idempotent" error list. All the named issues are addressed. Wrt to the 3rd, there is the new global system variable, changeble at run time, which controls the slave sql thread behaviour. The new variable allows further extensions to mimic the sql_mode session/global variable. To address the 4th, the new bug#32468 had to be fixed as it was staying in the way. include/my_bitmap.h: basic operations with bits of an integer type are added. mysql-test/extra/rpl_tests/rpl_foreign_key.test: regression test for bug#32468 mysql-test/extra/rpl_tests/rpl_row_basic.test: changes due to bug#31552/31609 idempotency is not default any longer mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: changes due to bug#31552/31609 idempotency is not default any longer mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result: results changed mysql-test/suite/rpl/r/rpl_idempotency.result: results changed mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result: results changed mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result: results changed mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result: results changed mysql-test/suite/rpl/r/rpl_row_mystery22.result: results changed mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: results changed mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: results changed mysql-test/suite/rpl/r/rpl_temporary_errors.result: results changed mysql-test/suite/rpl/t/rpl_idempotency.test: extenstions to the test providing testing of complements to the idempotent error set and checking how slave halts when it faces an error from the list when the mode is STRICT. mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test: changes due to bug#31552/31609 idempotency is not default any longer. mysql-test/suite/rpl/t/rpl_row_mystery22.test: changes due to bug#31552/31609 idempotency is not default any longer mysql-test/suite/rpl/t/rpl_temporary_errors.test: changes due to bug#31552/31609 idempotency is not default any longer mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result: results changed mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result: results changed sql/log_event.cc: the fix for bug#32468 delete rows event on a table with foreign key constraint fails ensures the flags are set at proper time so that their values will be caught by innodb. reseting the flags is done along the common error and errorless execution path. The list of idempotent error is extended with foreign keys related items. NDB engine write events are designed with the replace sematics in mind. Therefore the corrsponding ndb handler's flag are (re)set regardless of the slave's execution mode. Rows_log_event::write_row() starts using the bool replace argument as its caller sets it depending on the event's execution mode. sql/log_event.h: adding a new member to hold the slave's mode during execution of the event. sql/mysql_priv.h: changes to link the command line option with the new global sys var. sql/mysqld.cc: introduction of the new command line option. providing its initialization to a default. changes to link the command line option with the new global sys var. sql/rpl_rli.cc: rli post-event-execution cleanup restores the default bits. sql/set_var.cc: The new "standard" sys_var_set class' and the new global system var related declarations and definitions. fix_slave_exec_mode() is used as with the update method of a new class so as at time of the command line arguments parsing. sql/set_var.h: new declarations. The class for the new global sys var is based on yet another new "standard" one. sql/share/errmsg.txt: slave_exec_mode setting error; slave inconsistency error which may be not an error when the intention is "idempotent". I.e consisting of row-based events binlog is being applied for the 2nd (more) time. sql/sql_class.h: The names for the bits of the new sever slave_exec_mode_options. mysql-test/suite/rpl/t/rpl_idempotency-master.opt: innodb is necessary mysql-test/suite/rpl/t/rpl_idempotency-slave.opt: innodb is necessary, as well as the tests start with non-default IDEMPOTENT slave execution mode.
255 lines
8.1 KiB
Text
255 lines
8.1 KiB
Text
# Test how replication of tables work when the definition on the
|
|
# master and slave differs.
|
|
|
|
# Consider making these part of the basic RBR tests.
|
|
|
|
connection master;
|
|
--disable_warnings
|
|
--disable_query_log
|
|
DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;
|
|
DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t9;
|
|
--enable_query_log
|
|
--enable_warnings
|
|
sync_slave_with_master;
|
|
STOP SLAVE;
|
|
SET @my_sql_mode= @@global.sql_mode;
|
|
SET GLOBAL SQL_MODE='STRICT_ALL_TABLES';
|
|
START SLAVE;
|
|
|
|
connection master;
|
|
eval CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t1_bit (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t1_char (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t1_nodef (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t4 (a INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t5 (a INT, b INT, c INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t6 (a INT, b INT, c INT) ENGINE=$engine_type;
|
|
eval CREATE TABLE t7 (a INT NOT NULL) ENGINE=$engine_type;
|
|
eval CREATE TABLE t8 (a INT NOT NULL) ENGINE=$engine_type;
|
|
|
|
# Table used to detect that slave is running
|
|
eval CREATE TABLE t9 (a INT) ENGINE=$engine_type;
|
|
|
|
sync_slave_with_master;
|
|
|
|
# On the slave, we add one INT column last in table 't1_int',
|
|
ALTER TABLE t1_int ADD x INT DEFAULT 42;
|
|
# ... and add BIT columns last in table 't1_bit' to ensure that we
|
|
# have at least one extra null byte on the slave,
|
|
ALTER TABLE t1_bit
|
|
ADD x BIT(3) DEFAULT b'011',
|
|
ADD y BIT(5) DEFAULT b'10101',
|
|
ADD z BIT(2) DEFAULT b'10';
|
|
# ... and add one CHAR column last in table 't1_char',
|
|
ALTER TABLE t1_char ADD x CHAR(20) DEFAULT 'Just a test';
|
|
# ... and add one non-nullable INT column last in table 't1_text'
|
|
# with no default,
|
|
ALTER TABLE t1_nodef ADD x INT NOT NULL;
|
|
# ... and remove the last column in t2
|
|
ALTER TABLE t2 DROP b;
|
|
# ... change the type of the single column in table 't4'
|
|
ALTER TABLE t4 MODIFY a FLOAT;
|
|
# ... change the type of the middle column of table 't5'
|
|
ALTER TABLE t5 MODIFY b FLOAT;
|
|
# ... change the type of the last column of table 't6'
|
|
ALTER TABLE t6 MODIFY c FLOAT;
|
|
|
|
# ... add one byte worth of null bytes to the table on the slave
|
|
ALTER TABLE t7 ADD e1 INT, ADD e2 INT, ADD e3 INT, ADD e4 INT,
|
|
ADD e5 INT, ADD e6 INT, ADD e7 INT, ADD e8 INT;
|
|
|
|
# ... add 8 columns that are nullable: t8 will not be entirely
|
|
# nullable and have no null bits (just an X bit)
|
|
ALTER TABLE t8 ADD e1 INT NOT NULL DEFAULT 0, ADD e2 INT NOT NULL DEFAULT 0,
|
|
ADD e3 INT NOT NULL DEFAULT 0, ADD e4 INT NOT NULL DEFAULT 0,
|
|
ADD e5 INT NOT NULL DEFAULT 0, ADD e6 INT NOT NULL DEFAULT 0,
|
|
ADD e7 INT NOT NULL DEFAULT 0, ADD e8 INT NOT NULL DEFAULT 0;
|
|
|
|
# Insert some values for tables on slave side. These should not be
|
|
# modified when the row from the master is applied.
|
|
# since bug#31552/31609 idempotency is not default any longer. In order
|
|
# the following INSERTs to pass the mode is switched temprorarily
|
|
set @@global.slave_exec_mode= 'IDEMPOTENT';
|
|
|
|
# so the inserts are going to be overriden
|
|
INSERT INTO t1_int VALUES (2, 4, 4711);
|
|
INSERT INTO t1_char VALUES (2, 4, 'Foo is a bar');
|
|
INSERT INTO t1_bit VALUES (2, 4, b'101', b'11100', b'01');
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
INSERT INTO t1_int VALUES (1,2);
|
|
INSERT INTO t1_int VALUES (2,5);
|
|
INSERT INTO t1_bit VALUES (1,2);
|
|
INSERT INTO t1_bit VALUES (2,5);
|
|
INSERT INTO t1_char VALUES (1,2);
|
|
INSERT INTO t1_char VALUES (2,5);
|
|
SELECT * FROM t1_int ORDER BY a;
|
|
SELECT * FROM t1_bit ORDER BY a;
|
|
SELECT * FROM t1_char ORDER BY a;
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
set @@global.slave_exec_mode= default;
|
|
|
|
SELECT a,b,x FROM t1_int ORDER BY a;
|
|
SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit ORDER BY a;
|
|
SELECT a,b,x FROM t1_char ORDER BY a;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
UPDATE t1_int SET b=2*b WHERE a=2;
|
|
UPDATE t1_char SET b=2*b WHERE a=2;
|
|
UPDATE t1_bit SET b=2*b WHERE a=2;
|
|
SELECT * FROM t1_int ORDER BY a;
|
|
SELECT * FROM t1_bit ORDER BY a;
|
|
SELECT * FROM t1_char ORDER BY a;
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SELECT a,b,x FROM t1_int ORDER BY a;
|
|
SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit ORDER BY a;
|
|
SELECT a,b,x FROM t1_char ORDER BY a;
|
|
|
|
# Each of these inserts should generate an error and stop the slave
|
|
|
|
connection master;
|
|
INSERT INTO t9 VALUES (2);
|
|
sync_slave_with_master;
|
|
# Now slave is guaranteed to be running
|
|
connection master;
|
|
INSERT INTO t1_nodef VALUES (1,2);
|
|
connection slave;
|
|
--source include/wait_for_slave_sql_to_stop.inc
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
|
|
--query_vertical SHOW SLAVE STATUS
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
|
|
#
|
|
# Replicating to tables with fewer columns at the end works as of WL#3228
|
|
#
|
|
connection master;
|
|
INSERT INTO t9 VALUES (2);
|
|
sync_slave_with_master;
|
|
# Now slave is guaranteed to be running
|
|
connection master;
|
|
--echo **** On Master ****
|
|
INSERT INTO t2 VALUES (2,4);
|
|
SELECT * FROM t2;
|
|
sync_slave_with_master;
|
|
--echo **** On Slave ****
|
|
SELECT * FROM t2;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
|
|
--query_vertical SHOW SLAVE STATUS
|
|
|
|
connection master;
|
|
INSERT INTO t9 VALUES (4);
|
|
sync_slave_with_master;
|
|
# Now slave is guaranteed to be running
|
|
connection master;
|
|
INSERT INTO t4 VALUES (4);
|
|
connection slave;
|
|
--source include/wait_for_slave_sql_to_stop.inc
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
|
|
--query_vertical SHOW SLAVE STATUS
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
|
|
connection master;
|
|
INSERT INTO t9 VALUES (5);
|
|
sync_slave_with_master;
|
|
# Now slave is guaranteed to be running
|
|
connection master;
|
|
INSERT INTO t5 VALUES (5,10,25);
|
|
connection slave;
|
|
--source include/wait_for_slave_sql_to_stop.inc
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
|
|
--query_vertical SHOW SLAVE STATUS
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
|
|
connection master;
|
|
INSERT INTO t9 VALUES (6);
|
|
sync_slave_with_master;
|
|
# Now slave is guaranteed to be running
|
|
connection master;
|
|
INSERT INTO t6 VALUES (6,12,36);
|
|
connection slave;
|
|
--source include/wait_for_slave_sql_to_stop.inc
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
|
|
--query_vertical SHOW SLAVE STATUS
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
|
|
connection master;
|
|
INSERT INTO t9 VALUES (6);
|
|
sync_slave_with_master;
|
|
--replace_result $SLAVE_MYPORT SLAVE_PORT
|
|
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
|
|
--query_vertical SHOW SLAVE STATUS
|
|
|
|
# Testing some tables extra field that can be null and cannot be null
|
|
# (but have default values)
|
|
|
|
connection master;
|
|
INSERT INTO t7 VALUES (1),(2),(3);
|
|
INSERT INTO t8 VALUES (1),(2),(3);
|
|
SELECT * FROM t7 ORDER BY a;
|
|
SELECT * FROM t8 ORDER BY a;
|
|
sync_slave_with_master;
|
|
SELECT * FROM t7 ORDER BY a;
|
|
SELECT * FROM t8 ORDER BY a;
|
|
|
|
# We will now try to update and then delete a row on the master where
|
|
# the extra field on the slave does not have a default value. This
|
|
# update should not generate an error even though there is no default
|
|
# for the extra column.
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
TRUNCATE t1_nodef;
|
|
SET SQL_LOG_BIN=0;
|
|
INSERT INTO t1_nodef VALUES (1,2);
|
|
INSERT INTO t1_nodef VALUES (2,4);
|
|
SET SQL_LOG_BIN=1;
|
|
sync_slave_with_master;
|
|
|
|
--echo **** On Slave ****
|
|
connection slave;
|
|
INSERT INTO t1_nodef VALUES (1,2,3);
|
|
INSERT INTO t1_nodef VALUES (2,4,6);
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
UPDATE t1_nodef SET b=2*b WHERE a=1;
|
|
SELECT * FROM t1_nodef ORDER BY a;
|
|
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SELECT * FROM t1_nodef ORDER BY a;
|
|
|
|
--echo **** On Master ****
|
|
connection master;
|
|
DELETE FROM t1_nodef WHERE a=2;
|
|
SELECT * FROM t1_nodef ORDER BY a;
|
|
|
|
--echo **** On Slave ****
|
|
sync_slave_with_master;
|
|
SELECT * FROM t1_nodef ORDER BY a;
|
|
|
|
--echo **** Cleanup ****
|
|
connection master;
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;
|
|
DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9;
|
|
--enable_warnings
|
|
sync_slave_with_master;
|
|
|
|
# Restore sql_mode
|
|
SET @@global.sql_mode= @my_sql_mode;
|