From 6509b5b48ad09f2efee9ed6c37d28592d22b75c5 Mon Sep 17 00:00:00 2001
From: "cbell/Chuck@mysql_cab_desk." <>
Date: Fri, 27 Jul 2007 14:45:57 -0400
Subject: [PATCH] WL#3915 : (NDB) master's cols > slave

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.
---
 .../extra/rpl_tests/rpl_extraMaster_Col.test  | 393 ++++++++++++++++++
 .../extra/rpl_tests/rpl_row_tabledefs.test    |  63 ---
 mysql-test/r/rpl_extraColmaster_innodb.result | Bin 0 -> 24444 bytes
 mysql-test/r/rpl_extraColmaster_myisam.result | Bin 0 -> 24444 bytes
 .../r/rpl_row_extraColmaster_ndb.result       | Bin 0 -> 12256 bytes
 mysql-test/r/rpl_row_tabledefs_2myisam.result | 192 ---------
 mysql-test/r/rpl_row_tabledefs_3innodb.result | 192 ---------
 .../r/rpl_stm_extraColmaster_ndb.result       | Bin 0 -> 12256 bytes
 mysql-test/t/disabled.def                     |   1 +
 .../t/rpl_extraColmaster_innodb-master.opt    |   1 +
 .../t/rpl_extraColmaster_innodb-slave.opt     |   1 +
 mysql-test/t/rpl_extraColmaster_innodb.test   |  15 +
 mysql-test/t/rpl_extraColmaster_myisam.test   |  13 +
 mysql-test/t/rpl_row_extraColmaster_ndb.test  |  12 +
 mysql-test/t/rpl_stm_extraColmaster_ndb.test  |  13 +
 sql/log_event.cc                              |  19 +-
 sql/rpl_record.cc                             |  25 +-
 sql/rpl_utility.cc                            |  15 -
 18 files changed, 479 insertions(+), 476 deletions(-)
 create mode 100644 mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
 create mode 100644 mysql-test/r/rpl_extraColmaster_innodb.result
 create mode 100644 mysql-test/r/rpl_extraColmaster_myisam.result
 create mode 100644 mysql-test/r/rpl_row_extraColmaster_ndb.result
 create mode 100644 mysql-test/r/rpl_stm_extraColmaster_ndb.result
 create mode 100644 mysql-test/t/rpl_extraColmaster_innodb-master.opt
 create mode 100644 mysql-test/t/rpl_extraColmaster_innodb-slave.opt
 create mode 100644 mysql-test/t/rpl_extraColmaster_innodb.test
 create mode 100644 mysql-test/t/rpl_extraColmaster_myisam.test
 create mode 100644 mysql-test/t/rpl_row_extraColmaster_ndb.test
 create mode 100644 mysql-test/t/rpl_stm_extraColmaster_ndb.test

diff --git a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
new file mode 100644
index 00000000000..696bb74ec47
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
@@ -0,0 +1,393 @@
+#############################################################
+# Purpose: To test having extra columns on the master WL#3915
+# engine inspecific sourced part
+#############################################################
+
+# TODO: partition specific
+# -- source include/have_partition.inc
+
+########### Clean up ################
+--disable_warnings
+--disable_query_log
+DROP TABLE IF EXISTS  t1,t2,t3,t4,t31;
+
+--enable_query_log
+--enable_warnings
+
+#
+# Setup differently defined tables on master and slave
+#
+
+# Def on master: t (f_1 type_m_1,... f_s type_m_s, f_s1, f_m)
+# Def on slave:  t (f_1 type_s_1,... f_s type_s_s)
+# where type_mi,type_si (0 < i-1 <s1) pairs are compatible types (WL#3228)
+# Arbitrary paramaters of the test are:
+# 1. the tables type
+# 2. the types of the extra master's column f_s1,..., f_m
+# 3. the numbers of common columns `s' 
+# 4. and  extra columns `m' are par
+#
+# optionally
+#
+# 5. vary the common columns type within compatible ranges.
+
+#
+# constant size column type:
+
+#BIGINT       
+#BLOB         
+#DATE         
+#DATETIME     
+#FLOAT        
+#INT, INTEGER 
+#LONGBLOB      
+#LONGTEXT     
+#MEDIUMBLOB   
+#MEDIUMINT    
+#MEDIUMTEXT   
+#REAL         
+#SMALLINT     
+#TEXT         
+#TIME         
+#TIMESTAMP    
+#TINYBLOB     
+#TINYINT      
+#TINYTEXT     
+#YEAR         
+
+# variable size column types:
+
+#BINARY(M)    
+#BIT(M)        
+#CHAR(M)      
+#DECIMAL(M,D) 
+#DOUBLE[P]    
+#ENUM         
+#FLOAT(p)     
+#NUMERIC(M,D) 
+#SET           
+#VARBINARY(M) 
+#VARCHAR(M)    
+#
+
+
+connection master;
+    eval 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=$engine_type;
+
+#connection slave;
+   sync_slave_with_master;
+   alter table t1 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
+
+connection master;
+
+   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;
+
+
+#connection slave;
+   sync_slave_with_master;
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical show slave status;
+   select * from t1 order by f3;
+
+
+### Altering table def scenario
+
+connection master;
+
+   eval 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=$engine_type;
+
+   eval 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=$engine_type;
+
+
+# no ENUM and SET
+    eval 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=$engine_type;
+
+
+    eval 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=$engine_type;
+
+#connection slave;
+    sync_slave_with_master;
+    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;
+                 
+
+
+connection master;
+   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');
+   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';
+   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'
+      );
+   
+   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
+       );
+   
+#connection slave;
+   sync_slave_with_master;
+
+   select * from t1 order by f3;
+   select * from t2 order by f1;
+   select * from t3 order by f1;
+   select * from t4 order by f1;
+   select * from t31 order by f1;
+   
+connection master;
+
+   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;
+
+   delete from t1;
+   delete from t2;
+   delete from t3;
+   delete from t4;
+   delete from t31;
+
+#connection slave;
+   sync_slave_with_master;
+   select * from t31;
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--query_vertical show slave status;
+
+#### Clean Up ####
+
+connection master;
+--disable_warnings
+--disable_query_log
+  DROP TABLE t1,t2,t3,t4,t31;
+
+#connection slave;
+  sync_slave_with_master;
+--enable_query_log
+--enable_warnings
+
+# END of the tests
+
+
diff --git a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
index 0cf43d45348..698258ad529 100644
--- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
+++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
@@ -120,69 +120,6 @@ wait_for_slave_to_stop;
 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)
 
diff --git a/mysql-test/r/rpl_extraColmaster_innodb.result b/mysql-test/r/rpl_extraColmaster_innodb.result
new file mode 100644
index 0000000000000000000000000000000000000000..231732de7e062e6cd4ef2cc6909b0eae2384f390
GIT binary patch
literal 24444
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
DOB|dS

literal 0
HcmV?d00001

diff --git a/mysql-test/r/rpl_extraColmaster_myisam.result b/mysql-test/r/rpl_extraColmaster_myisam.result
new file mode 100644
index 0000000000000000000000000000000000000000..f4c258cd9eac1ca5863c0ad2988a15020f640117
GIT binary patch
literal 24444
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
D-KUy#

literal 0
HcmV?d00001

diff --git a/mysql-test/r/rpl_row_extraColmaster_ndb.result b/mysql-test/r/rpl_row_extraColmaster_ndb.result
new file mode 100644
index 0000000000000000000000000000000000000000..30332e9e7c8d3ee8084ec8aa2d8b8a9d3e1df72c
GIT binary patch
literal 12256
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

literal 0
HcmV?d00001

diff --git a/mysql-test/r/rpl_row_tabledefs_2myisam.result b/mysql-test/r/rpl_row_tabledefs_2myisam.result
index e41f8be055b..864dfa3e910 100644
--- a/mysql-test/r/rpl_row_tabledefs_2myisam.result
+++ b/mysql-test/r/rpl_row_tabledefs_2myisam.result
@@ -140,198 +140,6 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
-INSERT INTO t9 VALUES (2);
-INSERT INTO t2 VALUES (2,4);
-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	1523
-Last_Error	Table width mismatch - received 2 columns, test.t2 has 1 columns
-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 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	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	1523
-Last_Error	Column 0 type mismatch - received type 3, test.t4 has type 4
-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 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	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	1523
-Last_Error	Column 1 type mismatch - received type 3, test.t5 has type 4
-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 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	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	1523
-Last_Error	Column 2 type mismatch - received type 3, test.t6 has type 4
-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 t9 VALUES (6);
-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
 INSERT INTO t7 VALUES (1),(2),(3);
 INSERT INTO t8 VALUES (1),(2),(3);
 SELECT * FROM t7 ORDER BY a;
diff --git a/mysql-test/r/rpl_row_tabledefs_3innodb.result b/mysql-test/r/rpl_row_tabledefs_3innodb.result
index 72c088d5a6b..2850d709b83 100644
--- a/mysql-test/r/rpl_row_tabledefs_3innodb.result
+++ b/mysql-test/r/rpl_row_tabledefs_3innodb.result
@@ -140,198 +140,6 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
-INSERT INTO t9 VALUES (2);
-INSERT INTO t2 VALUES (2,4);
-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	1523
-Last_Error	Table width mismatch - received 2 columns, test.t2 has 1 columns
-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 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	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	1523
-Last_Error	Column 0 type mismatch - received type 3, test.t4 has type 4
-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 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	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	1523
-Last_Error	Column 1 type mismatch - received type 3, test.t5 has type 4
-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 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	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	1523
-Last_Error	Column 2 type mismatch - received type 3, test.t6 has type 4
-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 t9 VALUES (6);
-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
 INSERT INTO t7 VALUES (1),(2),(3);
 INSERT INTO t8 VALUES (1),(2),(3);
 SELECT * FROM t7 ORDER BY a;
diff --git a/mysql-test/r/rpl_stm_extraColmaster_ndb.result b/mysql-test/r/rpl_stm_extraColmaster_ndb.result
new file mode 100644
index 0000000000000000000000000000000000000000..30332e9e7c8d3ee8084ec8aa2d8b8a9d3e1df72c
GIT binary patch
literal 12256
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

literal 0
HcmV?d00001

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 0b17e47fead..a2358294a83 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -32,6 +32,7 @@ rpl_ndb_myisam2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb faile
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 synchronization          : Bug#24529  	Test 'synchronization' fails on Mac pushbuild; Also on Linux 64 bit.
 rpl_ndb_ctype_ucs2_def   : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
+rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported.
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
diff --git a/mysql-test/t/rpl_extraColmaster_innodb-master.opt b/mysql-test/t/rpl_extraColmaster_innodb-master.opt
new file mode 100644
index 00000000000..627becdbfb5
--- /dev/null
+++ b/mysql-test/t/rpl_extraColmaster_innodb-master.opt
@@ -0,0 +1 @@
+--innodb
diff --git a/mysql-test/t/rpl_extraColmaster_innodb-slave.opt b/mysql-test/t/rpl_extraColmaster_innodb-slave.opt
new file mode 100644
index 00000000000..1338b6eba04
--- /dev/null
+++ b/mysql-test/t/rpl_extraColmaster_innodb-slave.opt
@@ -0,0 +1 @@
+ --innodb
diff --git a/mysql-test/t/rpl_extraColmaster_innodb.test b/mysql-test/t/rpl_extraColmaster_innodb.test
new file mode 100644
index 00000000000..082c22329fa
--- /dev/null
+++ b/mysql-test/t/rpl_extraColmaster_innodb.test
@@ -0,0 +1,15 @@
+#############################################################
+# Purpose: To test having extra columns on the master WL#3915
+#############################################################
+-- source include/master-slave.inc
+-- source include/have_innodb.inc
+
+let $engine_type = 'InnoDB';
+
+set binlog_format=row;
+-- source extra/rpl_tests/rpl_extraMaster_Col.test
+
+set binlog_format=statement;
+-- source extra/rpl_tests/rpl_extraMaster_Col.test
+
+
diff --git a/mysql-test/t/rpl_extraColmaster_myisam.test b/mysql-test/t/rpl_extraColmaster_myisam.test
new file mode 100644
index 00000000000..5bbd7953294
--- /dev/null
+++ b/mysql-test/t/rpl_extraColmaster_myisam.test
@@ -0,0 +1,13 @@
+#############################################################
+# Purpose: To test having extra columns on the master WL#3915
+#############################################################
+-- source include/master-slave.inc
+
+let $engine_type = 'MyISAM';
+
+set binlog_format=row;
+-- source extra/rpl_tests/rpl_extraMaster_Col.test
+
+set binlog_format=statement;
+-- source extra/rpl_tests/rpl_extraMaster_Col.test
+
diff --git a/mysql-test/t/rpl_row_extraColmaster_ndb.test b/mysql-test/t/rpl_row_extraColmaster_ndb.test
new file mode 100644
index 00000000000..b91947e52e2
--- /dev/null
+++ b/mysql-test/t/rpl_row_extraColmaster_ndb.test
@@ -0,0 +1,12 @@
+###########################################
+# Purpose: Wrapper for rpl_extraMaster_Col.test
+#          Using NDB
+########################################### 
+-- source include/have_ndb.inc
+-- source include/ndb_master-slave.inc
+-- source include/have_binlog_format_row.inc
+
+let $engine_type = 'NDB';
+
+-- source extra/rpl_tests/rpl_extraMaster_Col.test
+
diff --git a/mysql-test/t/rpl_stm_extraColmaster_ndb.test b/mysql-test/t/rpl_stm_extraColmaster_ndb.test
new file mode 100644
index 00000000000..84734204439
--- /dev/null
+++ b/mysql-test/t/rpl_stm_extraColmaster_ndb.test
@@ -0,0 +1,13 @@
+###########################################
+# Purpose: Wrapper for rpl_extraMaster_Col.test
+#          Using NDB
+########################################### 
+-- source include/have_ndb.inc
+-- source include/ndb_master-slave.inc
+-- source include/have_binlog_format_statement.inc
+
+let $engine_type = 'NDB';
+
+-- source extra/rpl_tests/rpl_extraMaster_Col.test
+
+
diff --git a/sql/log_event.cc b/sql/log_event.cc
index eb1f6aeeaf9..c9980634476 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -7067,6 +7067,7 @@ copy_extra_record_fields(TABLE *table,
                          my_size_t master_reclength,
                          my_ptrdiff_t master_fields)
 {
+  DBUG_ENTER("copy_extra_record_fields(table, master_reclen, master_fields)");
   DBUG_PRINT("info", ("Copying to 0x%lx "
                       "from field %lu at offset %lu "
                       "to field %d at offset %lu",
@@ -7077,6 +7078,10 @@ copy_extra_record_fields(TABLE *table,
     Copying the extra fields of the slave that does not exist on
     master into record[0] (which are basically the default values).
   */
+
+  if (table->s->fields < (uint) master_fields)
+    DBUG_RETURN(0);
+
   DBUG_ASSERT(master_reclength <= table->s->reclength);
   if (master_reclength < table->s->reclength)
     bmove_align(table->record[0] + master_reclength,
@@ -7134,7 +7139,7 @@ copy_extra_record_fields(TABLE *table,
       }
     }
   }
-  return 0;                                     // All OK
+  DBUG_RETURN(0);                                     // All OK
 }
 
 #define DBUG_PRINT_BITSET(N,FRM,BS)                \
@@ -7723,12 +7728,6 @@ int Delete_rows_log_event::do_prepare_row(THD *thd, RELAY_LOG_INFO const *rli,
 {
   int error;
   DBUG_ASSERT(row_start && row_end);
-  /*
-    This assertion actually checks that there is at least as many
-    columns on the slave as on the master.
-  */
-  DBUG_ASSERT(table->s->fields >= m_width);
-
   error= unpack_row(rli, table, m_width, row_start, &m_cols, row_end,
                     &m_master_reclength, table->read_set, DELETE_ROWS_EVENT);
   /*
@@ -7897,12 +7896,6 @@ int Update_rows_log_event::do_prepare_row(THD *thd, RELAY_LOG_INFO const *rli,
 {
   int error;
   DBUG_ASSERT(row_start && row_end);
-  /*
-    This assertion actually checks that there is at least as many
-    columns on the slave as on the master.
-  */
-  DBUG_ASSERT(table->s->fields >= m_width);
-
   /*
     We need to perform some juggling below since unpack_row() always
     unpacks into table->record[0]. For more information, see the
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index d33d60300fd..db79a5dfd77 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -144,7 +144,8 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
    @param rli     Relay log info
    @param table   Table to unpack into
    @param colcnt  Number of columns to read from record
-   @param row     Packed row data
+   @param row_data
+                  Packed row data
    @param cols    Pointer to columns data to fill in
    @param row_end Pointer to variable that will hold the value of the
                   one-after-end position for the row
@@ -239,6 +240,28 @@ unpack_row(RELAY_LOG_INFO const *rli,
     i++;
   }
 
+  /*
+    throw away master's extra fields
+  */
+  uint max_cols= min(tabledef->size(), cols->n_bits);
+  for (; i < max_cols; i++)
+  {
+    if (bitmap_is_set(cols, i))
+    {
+      if ((null_mask & 0xFF) == 0)
+      {
+        DBUG_ASSERT(null_ptr < row_data + master_null_byte_count);
+        null_mask= 1U;
+        null_bits= *null_ptr++;
+      }
+      DBUG_ASSERT(null_mask & 0xFF); // One of the 8 LSB should be set
+
+      if (!((null_bits & null_mask) && tabledef->maybe_null(i)))
+        pack_ptr+= tabledef->calc_field_size(i, (uchar *) pack_ptr);
+      null_mask <<= 1;
+    }
+  }
+
   /*
     We should now have read all the null bytes, otherwise something is
     really wrong.
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index 143251991b5..91d045b040b 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -133,21 +133,6 @@ table_def::compatible_with(RELAY_LOG_INFO const *rli_arg, TABLE *table)
 
   TABLE_SHARE const *const tsh= table->s;
 
-  /*
-    To get proper error reporting for all columns of the table, we
-    both check the width and iterate over all columns.
-  */
-  if (tsh->fields < size())
-  {
-    DBUG_ASSERT(tsh->db.str && tsh->table_name.str);
-    error= 1;
-    slave_print_msg(ERROR_LEVEL, rli, ER_BINLOG_ROW_WRONG_TABLE_DEF,
-                    "Table width mismatch - "
-                    "received %u columns, %s.%s has %u columns",
-                    (uint) size(), tsh->db.str, tsh->table_name.str,
-                    tsh->fields);
-  }
-
   /*
     We now check for column type and size compatibility.
   */