mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
4924c61999
Field_bit::set_default() did not check the bit_len, hence used the undefined bit_ptr, causing a crash. The patch adds a check that bit_len > 0 before following the bit_ptr. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Doing select using ORDER BY to prevent table-internal order from affecting the result. mysql-test/r/rpl_row_tabledefs_2myisam.result: Result change mysql-test/r/rpl_row_tabledefs_3innodb.result: Result change sql/field.cc: Checking bit_len before following the bit_ptr, since bit_ptr has no sensible value in the case that bit_len == 0. sql/field.h: Field_bit::set_default() used the bit_ptr, but it is undefined, hence causing a crash. In reality, the hierarchy order is not correct so added a TODO comment about refactoring. sql/log_event.cc: Code was manipulating bits for a FIELD_TYPE_BIT field without checking if the bit_len was > 0, hence using an undefined bit_ptr when the class was actually a Field_bit_as_char. mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt: New BitKeeper file ``mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt''
240 lines
7.5 KiB
Text
240 lines
7.5 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 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.
|
|
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;
|
|
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;
|
|
wait_for_slave_to_stop;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 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 (2);
|
|
sync_slave_with_master;
|
|
# Now slave is guaranteed to be running
|
|
connection master;
|
|
INSERT INTO t2 VALUES (2,4);
|
|
connection slave;
|
|
wait_for_slave_to_stop;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 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 (4);
|
|
sync_slave_with_master;
|
|
# Now slave is guaranteed to be running
|
|
connection master;
|
|
INSERT INTO t4 VALUES (4);
|
|
connection slave;
|
|
wait_for_slave_to_stop;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 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;
|
|
wait_for_slave_to_stop;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 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;
|
|
wait_for_slave_to_stop;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 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 $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 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;
|