Commit 7ed63336 authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-wl3228 

into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl


sql/field.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/Makefile.am:
  Merge patch for worklog 3259 into mysql-5.1-rpl
sql/field.cc:
  Merge patch for worklog 3259 into mysql-5.1-rpl
sql/log_event.cc:
  Merge patch for worklog 3259 into mysql-5.1-rpl
parents aca18bf1 16105170

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

+82 −41
Original line number Diff line number Diff line
@@ -3,11 +3,23 @@ 


# Consider making these part of the basic RBR tests.



-- source include/have_binlog_format_row.inc

-- source include/master-slave.inc

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;



connection master;

eval CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t1_bit (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t1_char (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t1_nodef (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t4 (a INT) ENGINE=$engine_type;
@@ -15,15 +27,25 @@ eval CREATE TABLE t5 (a INT, b INT, c INT) ENGINE=$engine_type; 
eval CREATE TABLE t6 (a INT, b INT, c INT) ENGINE=$engine_type;



# Table used to detect that slave is running

eval CREATE TABLE t9 (a INT PRIMARY KEY) ENGINE=$engine_type;

eval CREATE TABLE t9 (a INT) ENGINE=$engine_type;



sync_slave_with_master;

# On the slave, we add one column last in table 't1',

ALTER TABLE t1 ADD x INT DEFAULT 42;

# ... add one column in the middle of table 't2', and

ALTER TABLE t2 ADD x INT DEFAULT 42 AFTER a;

# ... add one column first in table 't3'.

ALTER TABLE t3 ADD x INT DEFAULT 42 FIRST;



# On the slave, we add one INT column last in table 't1_int',

ALTER TABLE t1_int ADD x INT DEFAULT 42;

# ... 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'

#     with no default,

ALTER TABLE t1_nodef ADD x INT NOT NULL;

# ... and remove the last column in t2

ALTER TABLE t2 DROP b;

# ... change the type of the single column in table 't4'

ALTER TABLE t4 MODIFY a FLOAT;

# ... change the type of the middle column of table 't5'
@@ -31,49 +53,70 @@ ALTER TABLE t5 MODIFY b FLOAT; 
# ... change the type of the last column of table 't6'

ALTER TABLE t6 MODIFY c FLOAT;



# Each of these should generate an error and stop the slave

# Insert some values for tables on slave side. These should not be

# 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', b'11100', b'01');



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

connection master;

INSERT INTO t9 VALUES (1);

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;

SELECT * FROM t1_bit;

SELECT * FROM t1_char;

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

sync_slave_with_master;

# Now slave is guaranteed to be running

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;



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

connection master;

INSERT INTO t1 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;

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

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



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

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;



connection master;

INSERT INTO t9 VALUES (3);

INSERT INTO t9 VALUES (2);

sync_slave_with_master;

# Now slave is guaranteed to be running

connection master;

INSERT INTO t3 VALUES (3,6);

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;
@@ -86,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;
@@ -101,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;
@@ -116,14 +157,14 @@ 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;



connection master;

--disable_warnings

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

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

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

--enable_warnings

sync_slave_with_master;

mysql-test/r/rpl_row_tabledefs_2myisam.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='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 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;

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_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.result→mysql-test/r/rpl_row_tabledefs_7ndb.result

+106 −68

File changed and moved.

Preview size limit exceeded, changes collapsed.

mysql-test/t/disabled.def

+35 −24

File changed.

Preview size limit exceeded, changes collapsed.