Commit 16105170 authored by unknown's avatar unknown
Browse files

WL#3259 (RBR with more columns on slave than on master): 

Added support for UPDATE.
Some minor fixes.


mysql-test/t/rpl_row_tabledefs_2myisam.test:
  Rename: mysql-test/t/rpl_row_tabledefs.test -> mysql-test/t/rpl_row_tabledefs_2myisam.test
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Extending test to ensure that there is one more null byte on slave than
  it is on the master.
  Some cleanup.
sql/field.cc:
  Added support to find the last null byte for a field.
sql/field.h:
  Added support to find the last null byte for a field.
sql/log_event.cc:
  unpack_row() will now deduce the number of null bytes on the slave
  and use that when copying the null bytes from the row.
  Factored out code to copy "extra" record fields into separate function.
  Used that function to copy the "extra" fields when updating a row as well.
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Result change
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  New BitKeeper file ``mysql-test/r/rpl_row_tabledefs_3innodb.result''
mysql-test/r/rpl_row_tabledefs_7ndb.result:
  New BitKeeper file ``mysql-test/r/rpl_row_tabledefs_7ndb.result''
mysql-test/t/rpl_row_tabledefs_3innodb.test:
  New BitKeeper file ``mysql-test/t/rpl_row_tabledefs_3innodb.test''
parent 9a7ad1bf

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

+42 −22
Original line number Diff line number Diff line
@@ -3,7 +3,14 @@ 


# Consider making these part of the basic RBR tests.



connection slave;

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;
@@ -26,8 +33,12 @@ 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 one BIT column last in table 't1_bit',

ALTER TABLE t1_bit ADD x BIT(3) DEFAULT b'011';

# ... 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'
@@ -46,7 +57,7 @@ ALTER TABLE t6 MODIFY c FLOAT; 
# 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');

INSERT INTO t1_bit  VALUES (2, 4, b'101', b'11100', b'01');



--echo **** On Master ****

connection master;
@@ -62,7 +73,21 @@ SELECT * FROM t1_char; 
--echo **** On Slave ****

sync_slave_with_master;

SELECT a,b,x FROM t1_int;

SELECT a,b,HEX(x) FROM t1_bit;

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

SELECT a,b,x FROM t1_char;



--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;

SELECT * FROM t1_bit;

SELECT * FROM t1_char;

--echo **** On Slave ****

sync_slave_with_master;

SELECT a,b,x FROM t1_int;

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

SELECT a,b,x FROM t1_char;



# Each of these should generate an error and stop the slave
@@ -76,9 +101,8 @@ INSERT INTO t1_nodef VALUES (1,2); 
connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -91,9 +115,8 @@ INSERT INTO t2 VALUES (2,4); 
connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -106,9 +129,8 @@ INSERT INTO t4 VALUES (4); 
connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -121,9 +143,8 @@ INSERT INTO t5 VALUES (5,10,25); 
connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -136,9 +157,8 @@ INSERT INTO t6 VALUES (6,12,36); 
connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

mysql-test/r/rpl_row_tabledefs.result→mysql-test/r/rpl_row_tabledefs_2myisam.result

+50 −18
Original line number Diff line number Diff line
@@ -18,7 +18,10 @@ CREATE TABLE t5 (a INT, b INT, c INT) ENGINE='MyISAM'; 
CREATE TABLE t6 (a INT, b INT, c INT) 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';

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;
@@ -27,7 +30,7 @@ ALTER TABLE t5 MODIFY b FLOAT; 
ALTER TABLE t6 MODIFY c FLOAT;

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');

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);
@@ -52,14 +55,43 @@ SELECT a,b,x FROM t1_int; 
a	b	x

2	5	4711

1	2	42

SELECT a,b,HEX(x) FROM t1_bit;

a	b	HEX(x)

2	5	5

1	2	3

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

a	b	HEX(x)	HEX(y)	HEX(z)

2	5	5	1C	1

1	2	3	15	2

SELECT a,b,x FROM t1_char;

a	b	x

2	5	Foo is a bar

1	2	Just a test

**** 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;

a	b

1	2

2	10

SELECT * FROM t1_bit;

a	b

1	2

2	10

SELECT * FROM t1_char;

a	b

1	2

2	10

**** On Slave ****

SELECT a,b,x FROM t1_int;

a	b	x

2	10	4711

1	2	42

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

a	b	HEX(x)	HEX(y)	HEX(z)

2	10	5	1C	1

1	2	3	15	2

SELECT a,b,x FROM t1_char;

a	b	x

2	10	Foo is a bar

1	2	Just a test

INSERT INTO t9 VALUES (2);

INSERT INTO t1_nodef VALUES (1,2);

SHOW SLAVE STATUS;
@@ -69,7 +101,7 @@ Master_User root 
Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	1934

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -84,7 +116,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	1364

Last_Error	Error in Write_rows event: error during transaction execution on table test.t1_nodef

Skip_Counter	0

Exec_Master_Log_Pos	1850

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -107,7 +139,7 @@ Master_User root 
Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	2085

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -122,7 +154,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	1514

Last_Error	Table width mismatch - received 2 columns, test.t2 has 1 columns

Skip_Counter	0

Exec_Master_Log_Pos	2007

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -145,7 +177,7 @@ Master_User root 
Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	2231

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -160,7 +192,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	1514

Last_Error	Column 0 type mismatch - received type 3, test.t4 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	2158

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -183,7 +215,7 @@ Master_User root 
Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	2387

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -198,7 +230,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	1514

Last_Error	Column 1 type mismatch - received type 3, test.t5 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	2304

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -221,7 +253,7 @@ Master_User root 
Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	2543

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -236,7 +268,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	1514

Last_Error	Column 2 type mismatch - received type 3, test.t6 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	2460

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File

mysql-test/r/rpl_row_tabledefs_3innodb.result

0 → 100644
+286 −0
Original line number Diff line number Diff line 
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 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 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;

ALTER TABLE t2 DROP b;

ALTER TABLE t4 MODIFY a FLOAT;

ALTER TABLE t5 MODIFY b FLOAT;

ALTER TABLE t6 MODIFY c FLOAT;

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;

a	b

1	2

2	5

SELECT * FROM t1_bit;

a	b

1	2

2	5

SELECT * FROM t1_char;

a	b

1	2

2	5

**** On Slave ****

SELECT a,b,x FROM t1_int;

a	b	x

2	5	4711

1	2	42

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

a	b	HEX(x)	HEX(y)	HEX(z)

2	5	5	1C	1

1	2	3	15	2

SELECT a,b,x FROM t1_char;

a	b	x

2	5	Foo is a bar

1	2	Just a test

**** 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;

a	b

1	2

2	10

SELECT * FROM t1_bit;

a	b

1	2

2	10

SELECT * FROM t1_char;

a	b

1	2

2	10

**** On Slave ****

SELECT a,b,x FROM t1_int;

a	b	x

2	10	4711

1	2	42

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

a	b	HEX(x)	HEX(y)	HEX(z)

2	10	5	1C	1

1	2	3	15	2

SELECT a,b,x FROM t1_char;

a	b	x

2	10	Foo is a bar

1	2	Just a test

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	1364

Last_Error	Error in Write_rows event: error during transaction execution on table test.t1_nodef

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	#

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	1514

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	#

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	1514

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	#

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	1514

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	#

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	1514

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	#

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;

DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t9;

mysql-test/r/rpl_row_tabledefs_7ndb.result

0 → 100644
+286 −0
Original line number Diff line number Diff line 
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 GLOBAL SQL_MODE='STRICT_ALL_TABLES';

START SLAVE;

CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE='NDB';

CREATE TABLE t1_bit (a INT PRIMARY KEY, b INT) ENGINE='NDB';

CREATE TABLE t1_char (a INT PRIMARY KEY, b INT) ENGINE='NDB';

CREATE TABLE t1_nodef (a INT PRIMARY KEY, b INT) ENGINE='NDB';

CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE='NDB';

CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE='NDB';

CREATE TABLE t4 (a INT) ENGINE='NDB';

CREATE TABLE t5 (a INT, b INT, c INT) ENGINE='NDB';

CREATE TABLE t6 (a INT, b INT, c INT) ENGINE='NDB';

CREATE TABLE t9 (a INT) ENGINE='NDB';

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;

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;

a	b

1	2

2	5

SELECT * FROM t1_bit;

a	b

1	2

2	5

SELECT * FROM t1_char;

a	b

1	2

2	5

**** On Slave ****

SELECT a,b,x FROM t1_int;

a	b	x

1	2	42

2	5	42

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

a	b	HEX(x)	HEX(y)	HEX(z)

1	2	3	15	2

2	5	3	15	2

SELECT a,b,x FROM t1_char;

a	b	x

1	2	Just a test

2	5	Just a test

**** 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;

a	b

1	2

2	10

SELECT * FROM t1_bit;

a	b

1	2

2	10

SELECT * FROM t1_char;

a	b

1	2

2	10

**** On Slave ****

SELECT a,b,x FROM t1_int;

a	b	x

1	2	42

2	10	42

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

a	b	HEX(x)	HEX(y)	HEX(z)

1	2	3	15	2

2	10	3	15	2

SELECT a,b,x FROM t1_char;

a	b	x

1	2	Just a test

2	10	Just a test

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	1364

Last_Error	Error in Write_rows event: error during transaction execution on table test.t1_nodef

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	#

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	1514

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	#

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	1514

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	#

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	1514

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	#

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	1514

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	#

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;

DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t9;