mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
4375508a2d
Slave starts accepting and handling rows of master's tables which have more columns. The most important part of implementation is how to caclulate the amount of bytes to skip for unknown by slave column. To solve that issue this WL adopts results of WL#3228 which introduces an addon to table_map event that carries the necessary part of information about sizes of data of columns. mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@stripped, 2007-07-26 21:31:54-04:00, cbell@mysql_cab_desk. +393 -0 WL#3915 master's cols > slave basic tests checking altering and skipping extra fields by slave. The fields can be of any possible types. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: WL#3915 master's cols > slave Changed test to remove checks for error#1523 (more master cols than slave). This portion of the test is no longer needed. mysql-test/r/rpl_row_tabledefs_2myisam.result: WL#3915 master's cols > slave Corrected results from removal of checks for error#1523 (more master cols than slave). This portion of the test is no longer needed. mysql-test/r/rpl_row_tabledefs_3innodb.result: WL#3915 master's cols > slave Corrected results from removal of checks for error#1523 (more master cols than slave). This portion of the test is no longer needed. mysql-test/t/disabled.def: WL#3915 master's cols > slave Disabled the rpl_stm_extraColmaster_ndb test because statement-based replication is not supported in NDB at this time. It can be enabled when statement-based replication for NDB is released. sql/log_event.cc: WL#3915 master's cols > slave copying extra (slave's) fields returns early if master's table version is wider; removing assert in the way of master > slave cols. sql/rpl_record.cc: WL#3915 master's cols > slave adding a snippet that shift exectution curson donw the row skipping unknown by slave fields' data. sql/rpl_utility.cc: WL#3915 master's cols > slave Remove warning message for master's cols > slave. mysql-test/t/rpl_extraColmaster_innodb-master.opt: WL#3915 master's cols > slave option for innodb mysql-test/t/rpl_extraColmaster_innodb-slave.opt: WL#3915 master's cols > slave option for innodb mysql-test/t/rpl_extraColmaster_innodb.test: WL#3915 master's cols > slave Test of innodb. Test runs in both statement- and row-based replication. mysql-test/t/rpl_extraColmaster_myisam.test: WL#3915 master's cols > slave Test of myisam. Test runs in both statement- and row-based replication. mysql-test/t/rpl_row_extraColmaster_ndb.test: WL#3915 master's cols > slave Test of ndb. Test runs in row-based replication. mysql-test/r/rpl_extraColmaster_innodb.result: WL#3915 master's cols > slave new results mysql-test/t/rpl_stm_extraColmaster_ndb.test: WL#3915 master's cols > slave Test of ndb. Test runs in statement-based replication. mysql-test/r/rpl_extraColmaster_myisam.result: WL#3915 master's cols > slave new results mysql-test/r/rpl_row_extraColmaster_ndb.result: WL#3915 master's cols > slave new results mysql-test/r/rpl_stm_extraColmaster_ndb.result: WL#3915 master's cols > slave new results mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: WL#3915 master's cols > slave basic tests checking altering and skipping extra fields by slave. The fields can be of any possible types.
197 lines
4.9 KiB
Text
197 lines
4.9 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='MyISAM';
|
|
CREATE TABLE t1_bit (a INT PRIMARY KEY, b INT) ENGINE='MyISAM';
|
|
CREATE TABLE t1_char (a INT PRIMARY KEY, b INT) ENGINE='MyISAM';
|
|
CREATE TABLE t1_nodef (a INT PRIMARY KEY, b INT) ENGINE='MyISAM';
|
|
CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE='MyISAM';
|
|
CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE='MyISAM';
|
|
CREATE TABLE t4 (a INT) ENGINE='MyISAM';
|
|
CREATE TABLE t5 (a INT, b INT, c INT) ENGINE='MyISAM';
|
|
CREATE TABLE t6 (a INT, b INT, c INT) ENGINE='MyISAM';
|
|
CREATE TABLE t7 (a INT NOT NULL) ENGINE='MyISAM';
|
|
CREATE TABLE t8 (a INT NOT NULL) ENGINE='MyISAM';
|
|
CREATE TABLE t9 (a INT) ENGINE='MyISAM';
|
|
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;
|
|
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;
|
|
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 ****
|
|
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 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 1105
|
|
Last_Error Error in Write_rows event: error during transaction execution on table test.t1_nodef. Unknown 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
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
|
|
START SLAVE;
|
|
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);
|
|
INSERT INTO t1_nodef VALUES (2,4,6);
|
|
**** 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
|
|
1 4 3
|
|
2 4 6
|
|
**** 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
|
|
1 4 3
|
|
**** 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;
|