mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 07:14:17 +01:00
571843804c
Row-based replication requires the types of columns on the master and slave to be approximately the same (some safe conversions between strings are allowed), but does not allow safe conversions between fields of similar types such as TINYINT and INT. This patch implement type conversions between similar fields on the master and slave. The conversions are controlled using a new variable SLAVE_TYPE_CONVERSIONS of type SET('ALL_LOSSY','ALL_NON_LOSSY'). Non-lossy conversions are any conversions that do not run the risk of losing any information, while lossy conversions can potentially truncate the value. The column definitions are checked to decide if the conversion is acceptable. If neither conversion is enabled, it is required that the definitions of the columns are identical on master and slave. Conversion is done by creating an internal conversion table, unpacking the master data into it, and then copy the data to the real table on the slave. .bzrignore: New files added client/Makefile.am: New files added client/mysqlbinlog.cc: Functions in rpl_utility.cc is now needed by mysqlbinlog.cc. libmysqld/Makefile.am: New files added mysql-test/extra/rpl_tests/check_type.inc: Test include file to check a single type conversion. mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test: Switching to use INT instead of TEXT for column that should not have matching types. mysql-test/extra/rpl_tests/rpl_row_basic.test: Adding code to enable type conversions for BIT tests since InnoDB cannot handle them properly due to incorrect information stored as metadata. mysql-test/extra/rpl_tests/type_conversions.test: Test file to check a set of type conversions with current settings of slave_type_conversions. mysql-test/suite/rpl/t/rpl_typeconv.test: Test file to test conversions from master to slave with all possible values for slave_type_conversions. The test also checks that the slave_type_conversions variable works as expected. sql/field.cc: Changing definition of compatible_field_size to both check if two field with identical base types are compatible and give an order between them if they are compatible. This only implement checking on the slave, so it will not affect replication from an old master to a new slave. sql/field.h: Changing prototypes for functions: - compatible_field_size() - init_for_tmp_table() - row_pack_length() sql/log_event.cc: Changing compability checks to build a conversion table if the fields are compatible, but does not have the same base type. sql/log_event_old.cc: Changing compability checks to build a conversion table if the fields are compatible, but does not have the same base type. sql/mysql_priv.h: Adding global option variable for SLAVE_TYPE_CONVERSIONS sql/mysqld.cc: Adding SLAVE_TYPE_CONVERSIONS global server variable. sql/rpl_record.cc: Changing unpack_row to use the conversion table if present. sql/rpl_rli.h: Removing function get_tabledef and replacing it with get_table_data(). This function retrieve data for table opened for replication, not just table definition. sql/rpl_utility.cc: Function table_def::compatible_with is changed to compare table on master and slave for compatibility and generate a conversions table if they are compatible. Computing real type of fields from metadata for ENUM and SET types. Computing pack_length correctly for ENUM, SET, and BLOB types. Adding optimization to not check compatibility if no slave type conversions are enabled. sql/rpl_utility.h: Changing prototypes since implementation has changed. Modifying table_def::type() to return real type instead of stored type. sql/set_var.cc: Adding SLAVE_TYPE_CONVERSIONS variable. sql/set_var.h: Adding SLAVE_TYPE_CONVERSIONS variable. sql/share/errmsg.txt: Adding error messages for slave type conversions. sql/sql_class.h: Adding SLAVE_TYPE_CONVERSIONS variable. sql/sql_select.cc: Correcting create_virtual_tmp_table() to compute null bit positions correctly in the presence of bit fields.
421 lines
9.7 KiB
Text
421 lines
9.7 KiB
Text
stop slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
reset master;
|
|
reset slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
start slave;
|
|
STOP SLAVE;
|
|
SET @my_sql_mode= @@global.sql_mode;
|
|
SET GLOBAL SQL_MODE='STRICT_ALL_TABLES';
|
|
START SLAVE;
|
|
CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE='InnoDB';
|
|
CREATE TABLE t1_bit (a INT PRIMARY KEY, b INT) ENGINE='InnoDB';
|
|
CREATE TABLE t1_char (a INT PRIMARY KEY, b INT) ENGINE='InnoDB';
|
|
CREATE TABLE t1_nodef (a INT PRIMARY KEY, b INT) ENGINE='InnoDB';
|
|
CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE='InnoDB';
|
|
CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE='InnoDB';
|
|
CREATE TABLE t4 (a INT) ENGINE='InnoDB';
|
|
CREATE TABLE t5 (a INT, b INT, c INT) ENGINE='InnoDB';
|
|
CREATE TABLE t6 (a INT, b INT, c INT) ENGINE='InnoDB';
|
|
CREATE TABLE t7 (a INT NOT NULL) ENGINE='InnoDB';
|
|
CREATE TABLE t8 (a INT NOT NULL) ENGINE='InnoDB';
|
|
CREATE TABLE t9 (a INT) ENGINE='InnoDB';
|
|
ALTER TABLE t1_int ADD x INT DEFAULT 42;
|
|
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';
|
|
ALTER TABLE t1_char ADD x CHAR(20) DEFAULT 'Just a test';
|
|
ALTER TABLE t1_nodef ADD x INT NOT NULL, ADD y INT NOT NULL, ADD z INT NOT NULL;
|
|
ALTER TABLE t2 DROP b;
|
|
ALTER TABLE t4 MODIFY a FLOAT;
|
|
ALTER TABLE t5 MODIFY b FLOAT;
|
|
ALTER TABLE t6 MODIFY c FLOAT;
|
|
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;
|
|
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;
|
|
set @@global.slave_exec_mode= 'IDEMPOTENT';
|
|
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');
|
|
**** On 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;
|
|
a b
|
|
1 2
|
|
2 5
|
|
SELECT * FROM t1_bit ORDER BY a;
|
|
a b
|
|
1 2
|
|
2 5
|
|
SELECT * FROM t1_char ORDER BY a;
|
|
a b
|
|
1 2
|
|
2 5
|
|
**** On Slave ****
|
|
set @@global.slave_exec_mode= default;
|
|
SELECT a,b,x FROM t1_int ORDER BY a;
|
|
a b x
|
|
1 2 42
|
|
2 5 4711
|
|
SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit ORDER BY a;
|
|
a b HEX(x) HEX(y) HEX(z)
|
|
1 2 3 15 2
|
|
2 5 5 1C 1
|
|
SELECT a,b,x FROM t1_char ORDER BY a;
|
|
a b x
|
|
1 2 Just a test
|
|
2 5 Foo is a bar
|
|
**** On 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;
|
|
a b
|
|
1 2
|
|
2 10
|
|
SELECT * FROM t1_bit ORDER BY a;
|
|
a b
|
|
1 2
|
|
2 10
|
|
SELECT * FROM t1_char ORDER BY a;
|
|
a b
|
|
1 2
|
|
2 10
|
|
**** On Slave ****
|
|
SELECT a,b,x FROM t1_int ORDER BY a;
|
|
a b x
|
|
1 2 42
|
|
2 10 4711
|
|
SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit ORDER BY a;
|
|
a b HEX(x) HEX(y) HEX(z)
|
|
1 2 3 15 2
|
|
2 10 5 1C 1
|
|
SELECT a,b,x FROM t1_char ORDER BY a;
|
|
a b x
|
|
1 2 Just a test
|
|
2 10 Foo is a bar
|
|
INSERT INTO t9 VALUES (2);
|
|
INSERT INTO t1_nodef VALUES (1,2);
|
|
SHOW SLAVE STATUS;
|
|
Slave_IO_State #
|
|
Master_Host 127.0.0.1
|
|
Master_User root
|
|
Master_Port #
|
|
Connect_Retry 1
|
|
Master_Log_File master-bin.000001
|
|
Read_Master_Log_Pos #
|
|
Relay_Log_File #
|
|
Relay_Log_Pos #
|
|
Relay_Master_Log_File master-bin.000001
|
|
Slave_IO_Running Yes
|
|
Slave_SQL_Running No
|
|
Replicate_Do_DB
|
|
Replicate_Ignore_DB
|
|
Replicate_Do_Table
|
|
Replicate_Ignore_Table
|
|
Replicate_Wild_Do_Table
|
|
Replicate_Wild_Ignore_Table
|
|
Last_Errno 1364
|
|
Last_Error <Last_Error>
|
|
Skip_Counter 0
|
|
Exec_Master_Log_Pos #
|
|
Relay_Log_Space #
|
|
Until_Condition None
|
|
Until_Log_File
|
|
Until_Log_Pos 0
|
|
Master_SSL_Allowed No
|
|
Master_SSL_CA_File
|
|
Master_SSL_CA_Path
|
|
Master_SSL_Cert
|
|
Master_SSL_Cipher
|
|
Master_SSL_Key
|
|
Seconds_Behind_Master #
|
|
Master_SSL_Verify_Server_Cert No
|
|
Last_IO_Errno <Last_IO_Errno>
|
|
Last_IO_Error <Last_IO_Error>
|
|
Last_SQL_Errno 1364
|
|
Last_SQL_Error <Last_SQL_Error>
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
INSERT INTO t9 VALUES (2);
|
|
**** On Master ****
|
|
INSERT INTO t2 VALUES (2,4);
|
|
SELECT * FROM t2;
|
|
a b
|
|
2 4
|
|
**** On Slave ****
|
|
SELECT * FROM t2;
|
|
a
|
|
2
|
|
SHOW SLAVE STATUS;
|
|
Slave_IO_State #
|
|
Master_Host 127.0.0.1
|
|
Master_User root
|
|
Master_Port #
|
|
Connect_Retry 1
|
|
Master_Log_File master-bin.000001
|
|
Read_Master_Log_Pos #
|
|
Relay_Log_File #
|
|
Relay_Log_Pos #
|
|
Relay_Master_Log_File master-bin.000001
|
|
Slave_IO_Running Yes
|
|
Slave_SQL_Running Yes
|
|
Replicate_Do_DB
|
|
Replicate_Ignore_DB
|
|
Replicate_Do_Table
|
|
Replicate_Ignore_Table
|
|
Replicate_Wild_Do_Table
|
|
Replicate_Wild_Ignore_Table
|
|
Last_Errno 0
|
|
Last_Error <Last_Error>
|
|
Skip_Counter 0
|
|
Exec_Master_Log_Pos #
|
|
Relay_Log_Space #
|
|
Until_Condition None
|
|
Until_Log_File
|
|
Until_Log_Pos 0
|
|
Master_SSL_Allowed No
|
|
Master_SSL_CA_File
|
|
Master_SSL_CA_Path
|
|
Master_SSL_Cert
|
|
Master_SSL_Cipher
|
|
Master_SSL_Key
|
|
Seconds_Behind_Master #
|
|
Master_SSL_Verify_Server_Cert No
|
|
Last_IO_Errno <Last_IO_Errno>
|
|
Last_IO_Error <Last_IO_Error>
|
|
Last_SQL_Errno 0
|
|
Last_SQL_Error <Last_SQL_Error>
|
|
INSERT INTO t9 VALUES (4);
|
|
INSERT INTO t4 VALUES (4);
|
|
SHOW SLAVE STATUS;
|
|
Slave_IO_State #
|
|
Master_Host 127.0.0.1
|
|
Master_User root
|
|
Master_Port #
|
|
Connect_Retry 1
|
|
Master_Log_File master-bin.000001
|
|
Read_Master_Log_Pos #
|
|
Relay_Log_File #
|
|
Relay_Log_Pos #
|
|
Relay_Master_Log_File master-bin.000001
|
|
Slave_IO_Running Yes
|
|
Slave_SQL_Running No
|
|
Replicate_Do_DB
|
|
Replicate_Ignore_DB
|
|
Replicate_Do_Table
|
|
Replicate_Ignore_Table
|
|
Replicate_Wild_Do_Table
|
|
Replicate_Wild_Ignore_Table
|
|
Last_Errno 1641
|
|
Last_Error <Last_Error>
|
|
Skip_Counter 0
|
|
Exec_Master_Log_Pos #
|
|
Relay_Log_Space #
|
|
Until_Condition None
|
|
Until_Log_File
|
|
Until_Log_Pos 0
|
|
Master_SSL_Allowed No
|
|
Master_SSL_CA_File
|
|
Master_SSL_CA_Path
|
|
Master_SSL_Cert
|
|
Master_SSL_Cipher
|
|
Master_SSL_Key
|
|
Seconds_Behind_Master #
|
|
Master_SSL_Verify_Server_Cert No
|
|
Last_IO_Errno <Last_IO_Errno>
|
|
Last_IO_Error <Last_IO_Error>
|
|
Last_SQL_Errno 1641
|
|
Last_SQL_Error <Last_SQL_Error>
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
INSERT INTO t9 VALUES (5);
|
|
INSERT INTO t5 VALUES (5,10,25);
|
|
SHOW SLAVE STATUS;
|
|
Slave_IO_State #
|
|
Master_Host 127.0.0.1
|
|
Master_User root
|
|
Master_Port #
|
|
Connect_Retry 1
|
|
Master_Log_File master-bin.000001
|
|
Read_Master_Log_Pos #
|
|
Relay_Log_File #
|
|
Relay_Log_Pos #
|
|
Relay_Master_Log_File master-bin.000001
|
|
Slave_IO_Running Yes
|
|
Slave_SQL_Running No
|
|
Replicate_Do_DB
|
|
Replicate_Ignore_DB
|
|
Replicate_Do_Table
|
|
Replicate_Ignore_Table
|
|
Replicate_Wild_Do_Table
|
|
Replicate_Wild_Ignore_Table
|
|
Last_Errno 1641
|
|
Last_Error <Last_Error>
|
|
Skip_Counter 0
|
|
Exec_Master_Log_Pos #
|
|
Relay_Log_Space #
|
|
Until_Condition None
|
|
Until_Log_File
|
|
Until_Log_Pos 0
|
|
Master_SSL_Allowed No
|
|
Master_SSL_CA_File
|
|
Master_SSL_CA_Path
|
|
Master_SSL_Cert
|
|
Master_SSL_Cipher
|
|
Master_SSL_Key
|
|
Seconds_Behind_Master #
|
|
Master_SSL_Verify_Server_Cert No
|
|
Last_IO_Errno <Last_IO_Errno>
|
|
Last_IO_Error <Last_IO_Error>
|
|
Last_SQL_Errno 1641
|
|
Last_SQL_Error <Last_SQL_Error>
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
INSERT INTO t9 VALUES (6);
|
|
INSERT INTO t6 VALUES (6,12,36);
|
|
SHOW SLAVE STATUS;
|
|
Slave_IO_State #
|
|
Master_Host 127.0.0.1
|
|
Master_User root
|
|
Master_Port #
|
|
Connect_Retry 1
|
|
Master_Log_File master-bin.000001
|
|
Read_Master_Log_Pos #
|
|
Relay_Log_File #
|
|
Relay_Log_Pos #
|
|
Relay_Master_Log_File master-bin.000001
|
|
Slave_IO_Running Yes
|
|
Slave_SQL_Running No
|
|
Replicate_Do_DB
|
|
Replicate_Ignore_DB
|
|
Replicate_Do_Table
|
|
Replicate_Ignore_Table
|
|
Replicate_Wild_Do_Table
|
|
Replicate_Wild_Ignore_Table
|
|
Last_Errno 1641
|
|
Last_Error <Last_Error>
|
|
Skip_Counter 0
|
|
Exec_Master_Log_Pos #
|
|
Relay_Log_Space #
|
|
Until_Condition None
|
|
Until_Log_File
|
|
Until_Log_Pos 0
|
|
Master_SSL_Allowed No
|
|
Master_SSL_CA_File
|
|
Master_SSL_CA_Path
|
|
Master_SSL_Cert
|
|
Master_SSL_Cipher
|
|
Master_SSL_Key
|
|
Seconds_Behind_Master #
|
|
Master_SSL_Verify_Server_Cert No
|
|
Last_IO_Errno <Last_IO_Errno>
|
|
Last_IO_Error <Last_IO_Error>
|
|
Last_SQL_Errno 1641
|
|
Last_SQL_Error <Last_SQL_Error>
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
INSERT INTO t9 VALUES (6);
|
|
SHOW SLAVE STATUS;
|
|
Slave_IO_State #
|
|
Master_Host 127.0.0.1
|
|
Master_User root
|
|
Master_Port #
|
|
Connect_Retry 1
|
|
Master_Log_File master-bin.000001
|
|
Read_Master_Log_Pos #
|
|
Relay_Log_File #
|
|
Relay_Log_Pos #
|
|
Relay_Master_Log_File master-bin.000001
|
|
Slave_IO_Running Yes
|
|
Slave_SQL_Running Yes
|
|
Replicate_Do_DB
|
|
Replicate_Ignore_DB
|
|
Replicate_Do_Table
|
|
Replicate_Ignore_Table
|
|
Replicate_Wild_Do_Table
|
|
Replicate_Wild_Ignore_Table
|
|
Last_Errno 0
|
|
Last_Error <Last_Error>
|
|
Skip_Counter 0
|
|
Exec_Master_Log_Pos #
|
|
Relay_Log_Space #
|
|
Until_Condition None
|
|
Until_Log_File
|
|
Until_Log_Pos 0
|
|
Master_SSL_Allowed No
|
|
Master_SSL_CA_File
|
|
Master_SSL_CA_Path
|
|
Master_SSL_Cert
|
|
Master_SSL_Cipher
|
|
Master_SSL_Key
|
|
Seconds_Behind_Master #
|
|
Master_SSL_Verify_Server_Cert No
|
|
Last_IO_Errno <Last_IO_Errno>
|
|
Last_IO_Error <Last_IO_Error>
|
|
Last_SQL_Errno 0
|
|
Last_SQL_Error <Last_SQL_Error>
|
|
INSERT INTO t7 VALUES (1),(2),(3);
|
|
INSERT INTO t8 VALUES (1),(2),(3);
|
|
SELECT * FROM t7 ORDER BY a;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
SELECT * FROM t8 ORDER BY a;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
SELECT * FROM t7 ORDER BY a;
|
|
a e1 e2 e3 e4 e5 e6 e7 e8
|
|
1 NULL NULL NULL NULL NULL NULL NULL NULL
|
|
2 NULL NULL NULL NULL NULL NULL NULL NULL
|
|
3 NULL NULL NULL NULL NULL NULL NULL NULL
|
|
SELECT * FROM t8 ORDER BY a;
|
|
a e1 e2 e3 e4 e5 e6 e7 e8
|
|
1 0 0 0 0 0 0 0 0
|
|
2 0 0 0 0 0 0 0 0
|
|
3 0 0 0 0 0 0 0 0
|
|
**** On 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;
|
|
**** On Slave ****
|
|
INSERT INTO t1_nodef VALUES (1,2,3,4,5);
|
|
INSERT INTO t1_nodef VALUES (2,4,6,8,10);
|
|
**** On Master ****
|
|
UPDATE t1_nodef SET b=2*b WHERE a=1;
|
|
SELECT * FROM t1_nodef ORDER BY a;
|
|
a b
|
|
1 4
|
|
2 4
|
|
**** On Slave ****
|
|
SELECT * FROM t1_nodef ORDER BY a;
|
|
a b x y z
|
|
1 4 3 4 5
|
|
2 4 6 8 10
|
|
**** On Master ****
|
|
DELETE FROM t1_nodef WHERE a=2;
|
|
SELECT * FROM t1_nodef ORDER BY a;
|
|
a b
|
|
1 4
|
|
**** On Slave ****
|
|
SELECT * FROM t1_nodef ORDER BY a;
|
|
a b x y z
|
|
1 4 3 4 5
|
|
**** Cleanup ****
|
|
DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;
|
|
DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9;
|
|
SET @@global.sql_mode= @my_sql_mode;
|