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.
373 lines
12 KiB
Text
373 lines
12 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;
|
||
CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
|
||
/* extra */
|
||
f5 FLOAT DEFAULT '2.00',
|
||
f6 CHAR(4) DEFAULT 'TEST',
|
||
f7 INT DEFAULT '0',
|
||
f8 TEXT,
|
||
f9 LONGBLOB,
|
||
f10 BIT(63),
|
||
f11 VARBINARY(64))
|
||
ENGINE='NDB';
|
||
alter table t1 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
|
||
INSERT into t1 values (1, 1, 1, 'first', 1.0, 'yksi', 1, 'lounge of happiness', 'very fat blob', b'01010101010101', 0x123456);
|
||
INSERT into t1 values (2, 2, 2, 'second', 2.0, 'kaks', 2, 'got stolen from the paradise', 'very fat blob', b'01010101010101', 0x123456), (3, 3, 3, 'third', 3.0, 'kolm', 3, 'got stolen from the paradise', 'very fat blob', b'01010101010101', 0x123456);
|
||
update t1 set f4= 'next' where f1=1;
|
||
delete from t1 where f1=1;
|
||
select * from t1 order by f3;
|
||
f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11
|
||
2 2 2 second 2 kaks 2 got stolen from the paradise very fat blob U 4V
|
||
3 3 3 third 3 kolm 3 got stolen from the paradise very fat blob U 4V
|
||
show slave status;;
|
||
Slave_IO_State #
|
||
Master_Host 127.0.0.1
|
||
Master_User root
|
||
Master_Port 9306
|
||
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
|
||
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
|
||
select * from t1 order by f3;
|
||
f1 f2 f3 f4
|
||
2 2 2 second
|
||
3 3 3 third
|
||
CREATE TABLE t2 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
|
||
/* extra */
|
||
f5 DOUBLE DEFAULT '2.00',
|
||
f6 ENUM('a', 'b', 'c') default 'a',
|
||
f7 DECIMAL(17,9) default '1000.00',
|
||
f8 MEDIUMBLOB,
|
||
f9 NUMERIC(6,4) default '2000.00',
|
||
f10 VARCHAR(1024),
|
||
f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
|
||
f12 SET('a', 'b', 'c') default 'b')
|
||
ENGINE='NDB';
|
||
Warnings:
|
||
Warning 1264 Out of range value for column 'f9' at row 1
|
||
CREATE TABLE t3 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
|
||
/* extra */
|
||
f5 DOUBLE DEFAULT '2.00',
|
||
f6 ENUM('a', 'b', 'c') default 'a',
|
||
f8 MEDIUMBLOB,
|
||
f10 VARCHAR(1024),
|
||
f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
|
||
f12 SET('a', 'b', 'c') default 'b')
|
||
ENGINE='NDB';
|
||
CREATE TABLE t4 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
|
||
/* extra */
|
||
f5 DOUBLE DEFAULT '2.00',
|
||
f6 DECIMAL(17,9) default '1000.00',
|
||
f7 MEDIUMBLOB,
|
||
f8 NUMERIC(6,4) default '2000.00',
|
||
f9 VARCHAR(1024),
|
||
f10 BINARY(20) not null default '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
|
||
f11 CHAR(255))
|
||
ENGINE='NDB';
|
||
Warnings:
|
||
Warning 1264 Out of range value for column 'f8' at row 1
|
||
CREATE TABLE t31 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
|
||
/* extra */
|
||
f5 BIGINT,
|
||
f6 BLOB,
|
||
f7 DATE,
|
||
f8 DATETIME,
|
||
f9 FLOAT,
|
||
f10 INT,
|
||
f11 LONGBLOB,
|
||
f12 LONGTEXT,
|
||
f13 MEDIUMBLOB,
|
||
f14 MEDIUMINT,
|
||
f15 MEDIUMTEXT,
|
||
f16 REAL,
|
||
f17 SMALLINT,
|
||
f18 TEXT,
|
||
f19 TIME,
|
||
f20 TIMESTAMP,
|
||
f21 TINYBLOB,
|
||
f22 TINYINT,
|
||
f23 TINYTEXT,
|
||
f24 YEAR,
|
||
f25 BINARY(255),
|
||
f26 BIT(64),
|
||
f27 CHAR(255),
|
||
f28 DECIMAL(30,7),
|
||
f29 DOUBLE,
|
||
f30 ENUM ('a','b', 'c') default 'a',
|
||
f31 FLOAT,
|
||
f32 NUMERIC(17,9),
|
||
f33 SET ('a', 'b', 'c') default 'b',
|
||
f34 VARBINARY(1025),
|
||
f35 VARCHAR(257)
|
||
) ENGINE='NDB';
|
||
alter table t2 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11, drop
|
||
f12;
|
||
alter table t3 drop f5, drop f6, drop f8, drop f10, drop f11, drop f12;
|
||
alter table t4 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
|
||
alter table t31
|
||
drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11,
|
||
drop f12, drop f13, drop f14, drop f15, drop f16, drop f17, drop f18,
|
||
drop f19, drop f20, drop f21, drop f22, drop f23, drop f24, drop f25,
|
||
drop f26, drop f27, drop f28, drop f29, drop f30, drop f31, drop f32,
|
||
drop f33, drop f34, drop f35;
|
||
INSERT into t2 set f1=1, f2=1, f3=1, f4='first', f8='f8: medium size blob', f10='f10:
|
||
some var char';
|
||
INSERT into t2 values (2, 2, 2, 'second',
|
||
2.0, 'b', 2000.0002, 'f8: medium size blob', 2000, 'f10: some var char',
|
||
'01234567', 'c'),
|
||
(3, 3, 3, 'third',
|
||
3.0, 'b', 3000.0003, 'f8: medium size blob', 3000, 'f10: some var char',
|
||
'01234567', 'c');
|
||
Warnings:
|
||
Warning 1264 Out of range value for column 'f9' at row 1
|
||
Warning 1264 Out of range value for column 'f9' at row 2
|
||
INSERT into t3 set f1=1, f2=1, f3=1, f4='first', f10='f10: some var char';
|
||
INSERT into t4 set f1=1, f2=1, f3=1, f4='first', f7='f7: medium size blob', f10='f10:
|
||
binary data';
|
||
INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
|
||
INSERT into t31 set f1=1, f2=1, f3=2, f4='second',
|
||
f9=2.2, f10='seven samurai', f28=222.222, f35='222';
|
||
Warnings:
|
||
Warning 1366 Incorrect integer value: 'seven samurai' for column 'f10' at row 1
|
||
INSERT into t31 values (1, 1, 3, 'third',
|
||
/* f5 BIGINT, */ 333333333333333333333333,
|
||
/* f6 BLOB, */ '3333333333333333333333',
|
||
/* f7 DATE, */ '2007-07-18',
|
||
/* f8 DATETIME, */ "2007-07-18",
|
||
/* f9 FLOAT, */ 3.33333333,
|
||
/* f10 INT, */ 333333333,
|
||
/* f11 LONGBLOB, */ '3333333333333333333',
|
||
/* f12 LONGTEXT, */ '3333333333333333333',
|
||
/* f13 MEDIUMBLOB, */ '3333333333333333333',
|
||
/* f14 MEDIUMINT, */ 33,
|
||
/* f15 MEDIUMTEXT, */ 3.3,
|
||
/* f16 REAL, */ 3.3,
|
||
/* f17 SMALLINT, */ 3,
|
||
/* f18 TEXT, */ '33',
|
||
/* f19 TIME, */ '2:59:58.999',
|
||
/* f20 TIMESTAMP, */ 20000303000000,
|
||
/* f21 TINYBLOB, */ '3333',
|
||
/* f22 TINYINT, */ 3,
|
||
/* f23 TINYTEXT, */ '3',
|
||
/* f24 YEAR, */ 3000,
|
||
/* f25 BINARY(255), */ 'three_33333',
|
||
/* f26 BIT(64), */ b'011',
|
||
/* f27 CHAR(255), */ 'three',
|
||
/* f28 DECIMAL(30,7), */ 3.333,
|
||
/* f29 DOUBLE, */ 3.333333333333333333333333333,
|
||
/* f30 ENUM ('a','b','c')*/ 'c',
|
||
/* f31 FLOAT, */ 3.0,
|
||
/* f32 NUMERIC(17,9), */ 3.3333,
|
||
/* f33 SET ('a','b','c'),*/ 'c',
|
||
/*f34 VARBINARY(1025),*/ '3333 minus 3',
|
||
/*f35 VARCHAR(257),*/ 'three times three'
|
||
);
|
||
Warnings:
|
||
Warning 1264 Out of range value for column 'f5' at row 1
|
||
Warning 1264 Out of range value for column 'f24' at row 1
|
||
INSERT into t31 values (1, 1, 4, 'fourth',
|
||
/* f5 BIGINT, */ 333333333333333333333333,
|
||
/* f6 BLOB, */ '3333333333333333333333',
|
||
/* f7 DATE, */ '2007-07-18',
|
||
/* f8 DATETIME, */ "2007-07-18",
|
||
/* f9 FLOAT, */ 3.33333333,
|
||
/* f10 INT, */ 333333333,
|
||
/* f11 LONGBLOB, */ '3333333333333333333',
|
||
/* f12 LONGTEXT, */ '3333333333333333333',
|
||
/* f13 MEDIUMBLOB, */ '3333333333333333333',
|
||
/* f14 MEDIUMINT, */ 33,
|
||
/* f15 MEDIUMTEXT, */ 3.3,
|
||
/* f16 REAL, */ 3.3,
|
||
/* f17 SMALLINT, */ 3,
|
||
/* f18 TEXT, */ '33',
|
||
/* f19 TIME, */ '2:59:58.999',
|
||
/* f20 TIMESTAMP, */ 20000303000000,
|
||
/* f21 TINYBLOB, */ '3333',
|
||
/* f22 TINYINT, */ 3,
|
||
/* f23 TINYTEXT, */ '3',
|
||
/* f24 YEAR, */ 3000,
|
||
/* f25 BINARY(255), */ 'three_33333',
|
||
/* f26 BIT(64), */ b'011',
|
||
/* f27 CHAR(255), */ 'three',
|
||
/* f28 DECIMAL(30,7), */ 3.333,
|
||
/* f29 DOUBLE, */ 3.333333333333333333333333333,
|
||
/* f30 ENUM ('a','b','c')*/ 'c',
|
||
/* f31 FLOAT, */ 3.0,
|
||
/* f32 NUMERIC(17,9), */ 3.3333,
|
||
/* f33 SET ('a','b','c'),*/ 'c',
|
||
/*f34 VARBINARY(1025),*/ '3333 minus 3',
|
||
/*f35 VARCHAR(257),*/ 'three times three'
|
||
),
|
||
(1, 1, 5, 'fifth',
|
||
/* f5 BIGINT, */ 333333333333333333333333,
|
||
/* f6 BLOB, */ '3333333333333333333333',
|
||
/* f7 DATE, */ '2007-07-18',
|
||
/* f8 DATETIME, */ "2007-07-18",
|
||
/* f9 FLOAT, */ 3.33333333,
|
||
/* f10 INT, */ 333333333,
|
||
/* f11 LONGBLOB, */ '3333333333333333333',
|
||
/* f12 LONGTEXT, */ '3333333333333333333',
|
||
/* f13 MEDIUMBLOB, */ '3333333333333333333',
|
||
/* f14 MEDIUMINT, */ 33,
|
||
/* f15 MEDIUMTEXT, */ 3.3,
|
||
/* f16 REAL, */ 3.3,
|
||
/* f17 SMALLINT, */ 3,
|
||
/* f18 TEXT, */ '33',
|
||
/* f19 TIME, */ '2:59:58.999',
|
||
/* f20 TIMESTAMP, */ 20000303000000,
|
||
/* f21 TINYBLOB, */ '3333',
|
||
/* f22 TINYINT, */ 3,
|
||
/* f23 TINYTEXT, */ '3',
|
||
/* f24 YEAR, */ 3000,
|
||
/* f25 BINARY(255), */ 'three_33333',
|
||
/* f26 BIT(64), */ b'011',
|
||
/* f27 CHAR(255), */ 'three',
|
||
/* f28 DECIMAL(30,7), */ 3.333,
|
||
/* f29 DOUBLE, */ 3.333333333333333333333333333,
|
||
/* f30 ENUM ('a','b','c')*/ 'c',
|
||
/* f31 FLOAT, */ 3.0,
|
||
/* f32 NUMERIC(17,9), */ 3.3333,
|
||
/* f33 SET ('a','b','c'),*/ 'c',
|
||
/*f34 VARBINARY(1025),*/ '3333 minus 3',
|
||
/*f35 VARCHAR(257),*/ 'three times three'
|
||
),
|
||
(1, 1, 6, 'sixth',
|
||
/* f5 BIGINT, */ NULL,
|
||
/* f6 BLOB, */ '3333333333333333333333',
|
||
/* f7 DATE, */ '2007-07-18',
|
||
/* f8 DATETIME, */ "2007-07-18",
|
||
/* f9 FLOAT, */ 3.33333333,
|
||
/* f10 INT, */ 333333333,
|
||
/* f11 LONGBLOB, */ '3333333333333333333',
|
||
/* f12 LONGTEXT, */ '3333333333333333333',
|
||
/* f13 MEDIUMBLOB, */ '3333333333333333333',
|
||
/* f14 MEDIUMINT, */ 33,
|
||
/* f15 MEDIUMTEXT, */ 3.3,
|
||
/* f16 REAL, */ 3.3,
|
||
/* f17 SMALLINT, */ 3,
|
||
/* f18 TEXT, */ '33',
|
||
/* f19 TIME, */ '2:59:58.999',
|
||
/* f20 TIMESTAMP, */ 20000303000000,
|
||
/* f21 TINYBLOB, */ '3333',
|
||
/* f22 TINYINT, */ 3,
|
||
/* f23 TINYTEXT, */ '3',
|
||
/* f24 YEAR, */ 3000,
|
||
/* f25 BINARY(255), */ 'three_33333',
|
||
/* f26 BIT(64), */ b'011',
|
||
/* f27 CHAR(255), */ 'three',
|
||
/* f28 DECIMAL(30,7), */ 3.333,
|
||
/* f29 DOUBLE, */ 3.333333333333333333333333333,
|
||
/* f30 ENUM ('a','b','c')*/ 'c',
|
||
/* f31 FLOAT, */ 3.0,
|
||
/* f32 NUMERIC(17,9), */ 3.3333,
|
||
/* f33 SET ('a','b','c'),*/ 'c',
|
||
/*f34 VARBINARY(1025),*/ '3333 minus 3',
|
||
/*f35 VARCHAR(257),*/ NULL
|
||
);
|
||
Warnings:
|
||
Warning 1264 Out of range value for column 'f5' at row 1
|
||
Warning 1264 Out of range value for column 'f24' at row 1
|
||
Warning 1264 Out of range value for column 'f5' at row 2
|
||
Warning 1264 Out of range value for column 'f24' at row 2
|
||
Warning 1264 Out of range value for column 'f24' at row 3
|
||
select * from t1 order by f3;
|
||
f1 f2 f3 f4
|
||
2 2 2 second
|
||
3 3 3 third
|
||
select * from t2 order by f1;
|
||
f1 f2 f3 f4
|
||
1 1 1 first
|
||
2 2 2 second
|
||
3 3 3 third
|
||
select * from t3 order by f1;
|
||
f1 f2 f3 f4
|
||
1 1 1 first
|
||
select * from t4 order by f1;
|
||
f1 f2 f3 f4
|
||
1 1 1 first
|
||
select * from t31 order by f1;
|
||
f1 f2 f3 f4
|
||
1 1 5 fifth
|
||
1 1 3 third
|
||
1 1 1 first
|
||
1 1 6 sixth
|
||
1 1 2 second
|
||
1 1 4 fourth
|
||
update t31 set f5=555555555555555 where f3=6;
|
||
update t31 set f2=2 where f3=2;
|
||
update t31 set f1=NULL where f3=1;
|
||
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
|
||
Warnings:
|
||
Warning 1048 Column 'f3' cannot be null
|
||
delete from t1;
|
||
delete from t2;
|
||
delete from t3;
|
||
delete from t4;
|
||
delete from t31;
|
||
select * from t31;
|
||
f1 f2 f3 f4
|
||
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 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
|
||
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
|