List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:September 11 2006 1:33pm
Subject:bk commit into 5.1 tree (jmiller:1.2256)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-11 15:33:39+02:00, jmiller@stripped +6 -0
   Changes done per Lars Review

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@stripped, 2006-09-11 15:30:39+02:00, jmiller@stripped +29 -12
    Changes dones per Lars review

  mysql-test/r/rpl_extraCol_innodb.result@stripped, 2006-09-11 15:31:31+02:00, jmiller@stripped +29 -43
    Updated result file

  mysql-test/r/rpl_extraCol_myisam.result@stripped, 2006-09-11 15:31:24+02:00, jmiller@stripped +28 -12
    Updated result file

  mysql-test/r/rpl_ndb_extraCol.result@stripped, 2006-09-11 15:32:31+02:00, jmiller@stripped +28 -12
    Updated result file

  mysql-test/t/rpl_extraCol_innodb-master.opt@stripped, 2006-09-11 15:33:03+02:00, jmiller@stripped +1 -0
    Needed for innodb testing

  mysql-test/t/rpl_extraCol_innodb-master.opt@stripped, 2006-09-11 15:33:03+02:00, jmiller@stripped +0 -0

  mysql-test/t/rpl_extraCol_innodb-slave.opt@stripped, 2006-09-11 15:33:09+02:00, jmiller@stripped +1 -0
    Needed for innodb testing

  mysql-test/t/rpl_extraCol_innodb-slave.opt@stripped, 2006-09-11 15:33:09+02:00, jmiller@stripped +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jmiller
# Host:	ndb08.mysql.com
# Root:	/data2/mysql-5.1-new-rpl

--- 1.1/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2006-09-11 15:33:48 +02:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2006-09-11 15:33:48 +02:00
@@ -108,14 +108,14 @@
 --echo *** Create t3 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
-eval CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(5),
+eval CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(20),
                       d FLOAT DEFAULT '2.00',
                       e CHAR(5) DEFAULT 'TEST2')
                       ENGINE=$engine_type;
 
 --echo *** Create t3 on Master ***
 connection master;
-eval CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(5)
+eval CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(20)
                        ) ENGINE=$engine_type;
 RESET MASTER;
 
@@ -131,6 +131,9 @@
 
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
 
+--echo ********************************************
+--echo *** Expect slave to fail with Error 1522 ***
+--echo ********************************************
 connection slave;
 wait_for_slave_to_stop;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -152,14 +155,14 @@
 --echo *** Create t4 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
-eval CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(5),
+eval CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(20),
                       d FLOAT DEFAULT '2.00',
                       e CHAR(5) DEFAULT 'TEST2')
                       ENGINE=$engine_type;
 
 --echo *** Create t4 on Master ***
 connection master;
-eval CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(5)
+eval CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(20)
                        ) ENGINE=$engine_type;
 RESET MASTER;
 
@@ -173,6 +176,9 @@
 INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
                         (30000.22,4,'QA TESTING');
 
+--echo ********************************************
+--echo *** Expect slave to fail with Error 1522 ***
+--echo ********************************************
 connection slave;
 wait_for_slave_to_stop;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -215,6 +221,9 @@
 INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
                         (2,'JOE',300.01,0,'b2b2',1.0000009);
 
+--echo ********************************************
+--echo *** Expect slave to fail with Error 1522 ***
+--echo ********************************************
 connection slave;
 wait_for_slave_to_stop;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -258,6 +267,9 @@
 INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
                         (2,'JOE',300.01,0);
 
+--echo ********************************************
+--echo *** Expect slave to fail with Error 1522 ***
+--echo ********************************************
 connection slave;
 wait_for_slave_to_stop;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -399,6 +411,10 @@
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
+--echo *************************************************
+--echo ** Currently giving wrong error see bug#22234 ***
+--echo *************************************************
+#sync_slave_with_master;
 connection slave;
 wait_for_slave_to_stop;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -438,6 +454,9 @@
 set @b1 = concat(@b1,@b1);
 INSERT INTO t4 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
+--echo ********************************************
+--echo *** Expect slave to fail with Error 1522 ***
+--echo ********************************************
 connection slave;
 wait_for_slave_to_stop;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -479,6 +498,9 @@
 set @b1 = concat(@b1,@b1);
 INSERT INTO t5 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
+--echo ********************************************
+--echo *** Expect slave to fail with Error 1522 ***
+--echo ********************************************
 connection slave;
 wait_for_slave_to_stop;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -685,14 +707,10 @@
 --echo *** Add column on master that is a Extra on Slave ***
 connection master;
 ALTER TABLE t2 ADD COLUMN c6 INT AFTER c5;
-#INSERT INTO t2 () VALUES(4,1.00,'Replication Testing Extra Col',@b1,'Kyle',1);
-#SELECT * FROM t2 ORDER BY c1;
-
-#--echo *** Select on Slave ****
-#sync_slave_with_master;
-#--replace_column 7 CURRENT_TIMESTAMP
-#SELECT * FROM t2 ORDER BY c1;
 
+--echo ********************************************
+--echo *** Expect slave to fail with Error 1060 ***
+--echo ********************************************
 connection slave;
 wait_for_slave_to_stop;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -700,7 +718,6 @@
 --query_vertical SHOW SLAVE STATUS
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
-
 
 --echo *** DROP TABLE t2 ***
 connection master;

--- 1.1/mysql-test/r/rpl_extraCol_innodb.result	2006-09-11 15:33:48 +02:00
+++ 1.2/mysql-test/r/rpl_extraCol_innodb.result	2006-09-11 15:33:48 +02:00
@@ -12,8 +12,6 @@
 d FLOAT DEFAULT '2.00', 
 e CHAR(4) DEFAULT 'TEST') 
 ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
 *** Create t1 on Master ***
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c CHAR(10)
 ) ENGINE='InnoDB';
@@ -38,14 +36,12 @@
 *** Create t3 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
-CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(5),
+CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(20),
 d FLOAT DEFAULT '2.00',
 e CHAR(5) DEFAULT 'TEST2')
 ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't3'
 *** Create t3 on Master ***
-CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(5)
+CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(20)
 ) ENGINE='InnoDB';
 RESET MASTER;
 *** Start Slave ***
@@ -54,10 +50,9 @@
 set @b1 = 'b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
-Warning	1265	Data truncated for column 'c' at row 2
-Warning	1265	Data truncated for column 'c' at row 3
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -99,14 +94,12 @@
 *** Create t4 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
-CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(5),
+CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(20),
 d FLOAT DEFAULT '2.00',
 e CHAR(5) DEFAULT 'TEST2')
 ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't4'
 *** Create t4 on Master ***
-CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(5)
+CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(20)
 ) ENGINE='InnoDB';
 RESET MASTER;
 *** Start Slave ***
@@ -114,10 +107,9 @@
 *** Master Data Insert ***
 INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
 (30000.22,4,'QA TESTING');
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
-Warning	1265	Data truncated for column 'c' at row 2
-Warning	1265	Data truncated for column 'c' at row 3
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -162,8 +154,6 @@
 CREATE TABLE t5 (a INT PRIMARY KEY, b CHAR(5),
 c FLOAT, d INT, e DOUBLE,
 f DECIMAL(8,2))ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't5'
 *** Create t5 on Master ***
 CREATE TABLE t5 (a INT PRIMARY KEY, b VARCHAR(6),
 c DECIMAL(8,2), d BIT, e BLOB,
@@ -174,6 +164,9 @@
 *** Master Data Insert ***
 INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
 (2,'JOE',300.01,0,'b2b2',1.0000009);
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -217,8 +210,6 @@
 RESET SLAVE;
 CREATE TABLE t6 (a INT PRIMARY KEY, b CHAR(5),
 c FLOAT, d INT)ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't6'
 *** Create t6 on Master ***
 CREATE TABLE t6 (a INT PRIMARY KEY, b VARCHAR(6),
 c DECIMAL(8,2), d BIT 
@@ -229,6 +220,9 @@
 *** Master Data Insert ***
 INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
 (2,'JOE',300.01,0);
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -276,8 +270,6 @@
 d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
 e CHAR(20) DEFAULT 'Extra Column Testing')
 ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
 *** Create t1 on Master ***
 CREATE TABLE t1 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
 ) ENGINE='InnoDB';
@@ -307,8 +299,6 @@
 CREATE TABLE t2 (a INT KEY, b BLOB, c CHAR(5),
 d TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
 e INT)ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't2'
 *** Create t2 on Master ***
 CREATE TABLE t2 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
 ) ENGINE='InnoDB';
@@ -327,8 +317,6 @@
 CREATE TABLE t3 (a INT KEY, b BLOB, c CHAR(5),
 d TIMESTAMP,
 e INT DEFAULT '1')ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't3'
 *** Create t3 on Master ***
 CREATE TABLE t3 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
 ) ENGINE='InnoDB';
@@ -339,6 +327,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+*************************************************
+** Currently giving wrong error see bug#22234 ***
+*************************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -382,8 +373,6 @@
 RESET SLAVE;
 CREATE TABLE t4 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233', 
 c CHAR(5), e INT DEFAULT '1')ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't4'
 *** Create t4 on Master ***
 CREATE TABLE t4 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
 ) ENGINE='InnoDB';
@@ -394,6 +383,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t4 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -437,8 +429,6 @@
 RESET SLAVE;
 CREATE TABLE t5 (a INT KEY, b BLOB, f TEXT,
 c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't5'
 *** Create t5 on Master ***
 CREATE TABLE t5 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
 ) ENGINE='InnoDB';
@@ -449,6 +439,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t5 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -492,8 +485,6 @@
 RESET SLAVE;
 CREATE TABLE t6 (a INT KEY, b BLOB, f TEXT,
 c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't6'
 *** Create t6 on Master ***
 CREATE TABLE t6 (a INT PRIMARY KEY, b BLOB, c BLOB
 ) ENGINE='InnoDB';
@@ -526,8 +517,6 @@
 d INT DEFAULT '1',
 e TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
 )ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
 *** Create t1 on Master ***
 CREATE TABLE t1 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
 ) ENGINE='InnoDB';
@@ -560,8 +549,6 @@
 c6 INT DEFAULT '1',
 c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
 )ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
 *** Create t1 on Master ***
 CREATE TABLE t1 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
 ) ENGINE='InnoDB';
@@ -612,8 +599,6 @@
 c6 INT DEFAULT '1',
 c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
 )ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't2'
 *** Create t2 on Master ***
 CREATE TABLE t2 (c1 INT PRIMARY KEY, c2 DECIMAL(8,2), c3 TEXT,
 c4 BLOB, c5 CHAR(5)) ENGINE='InnoDB';
@@ -639,6 +624,9 @@
 3	3.00	If is does not, I will open a bug	b1b1b1b1b1b1b1b1	QA	1	CURRENT_TIMESTAMP
 *** Add column on master that is a Extra on Slave ***
 ALTER TABLE t2 ADD COLUMN c6 INT AFTER c5;
+********************************************
+*** Expect slave to fail with Error 1060 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -685,8 +673,6 @@
 c6 INT DEFAULT '1',
 c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
 )ENGINE='InnoDB';
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't3'
 *** Create t3 on Master ***
 CREATE TABLE t3 (c1 INT PRIMARY KEY, c2 DECIMAL(8,2), c3 TEXT,
 c4 BLOB, c5 CHAR(5))ENGINE='InnoDB';
@@ -735,7 +721,7 @@
   `c6` int(11) DEFAULT '1',
   `c7` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`c1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (c1) PARTITIONS 4  */
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (c1) PARTITIONS 4  */
 *** DROP TABLE t3 ***
 DROP TABLE t3;
 *** Alter Master End ***

--- 1.1/mysql-test/r/rpl_extraCol_myisam.result	2006-09-11 15:33:49 +02:00
+++ 1.2/mysql-test/r/rpl_extraCol_myisam.result	2006-09-11 15:33:49 +02:00
@@ -36,12 +36,12 @@
 *** Create t3 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
-CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(5),
+CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(20),
 d FLOAT DEFAULT '2.00',
 e CHAR(5) DEFAULT 'TEST2')
 ENGINE='MyISAM';
 *** Create t3 on Master ***
-CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(5)
+CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(20)
 ) ENGINE='MyISAM';
 RESET MASTER;
 *** Start Slave ***
@@ -50,10 +50,9 @@
 set @b1 = 'b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
-Warning	1265	Data truncated for column 'c' at row 2
-Warning	1265	Data truncated for column 'c' at row 3
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -95,12 +94,12 @@
 *** Create t4 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
-CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(5),
+CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(20),
 d FLOAT DEFAULT '2.00',
 e CHAR(5) DEFAULT 'TEST2')
 ENGINE='MyISAM';
 *** Create t4 on Master ***
-CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(5)
+CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(20)
 ) ENGINE='MyISAM';
 RESET MASTER;
 *** Start Slave ***
@@ -108,10 +107,9 @@
 *** Master Data Insert ***
 INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
 (30000.22,4,'QA TESTING');
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
-Warning	1265	Data truncated for column 'c' at row 2
-Warning	1265	Data truncated for column 'c' at row 3
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -166,6 +164,9 @@
 *** Master Data Insert ***
 INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
 (2,'JOE',300.01,0,'b2b2',1.0000009);
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -219,6 +220,9 @@
 *** Master Data Insert ***
 INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
 (2,'JOE',300.01,0);
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -323,6 +327,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+*************************************************
+** Currently giving wrong error see bug#22234 ***
+*************************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -376,6 +383,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t4 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -429,6 +439,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t5 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -611,6 +624,9 @@
 3	3.00	If is does not, I will open a bug	b1b1b1b1b1b1b1b1	QA	1	CURRENT_TIMESTAMP
 *** Add column on master that is a Extra on Slave ***
 ALTER TABLE t2 ADD COLUMN c6 INT AFTER c5;
+********************************************
+*** Expect slave to fail with Error 1060 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1

--- 1.1/mysql-test/r/rpl_ndb_extraCol.result	2006-09-11 15:33:49 +02:00
+++ 1.2/mysql-test/r/rpl_ndb_extraCol.result	2006-09-11 15:33:49 +02:00
@@ -36,12 +36,12 @@
 *** Create t3 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
-CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(5),
+CREATE TABLE t3 (a INT, b INT PRIMARY KEY, c CHAR(20),
 d FLOAT DEFAULT '2.00',
 e CHAR(5) DEFAULT 'TEST2')
 ENGINE='NDB';
 *** Create t3 on Master ***
-CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(5)
+CREATE TABLE t3 (a BLOB, b INT PRIMARY KEY, c CHAR(20)
 ) ENGINE='NDB';
 RESET MASTER;
 *** Start Slave ***
@@ -50,10 +50,9 @@
 set @b1 = 'b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
-Warning	1265	Data truncated for column 'c' at row 2
-Warning	1265	Data truncated for column 'c' at row 3
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -95,12 +94,12 @@
 *** Create t4 on slave  ***
 STOP SLAVE;
 RESET SLAVE;
-CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(5),
+CREATE TABLE t4 (a INT, b INT PRIMARY KEY, c CHAR(20),
 d FLOAT DEFAULT '2.00',
 e CHAR(5) DEFAULT 'TEST2')
 ENGINE='NDB';
 *** Create t4 on Master ***
-CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(5)
+CREATE TABLE t4 (a DECIMAL(8,2), b INT PRIMARY KEY, c CHAR(20)
 ) ENGINE='NDB';
 RESET MASTER;
 *** Start Slave ***
@@ -108,10 +107,9 @@
 *** Master Data Insert ***
 INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
 (30000.22,4,'QA TESTING');
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
-Warning	1265	Data truncated for column 'c' at row 2
-Warning	1265	Data truncated for column 'c' at row 3
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -166,6 +164,9 @@
 *** Master Data Insert ***
 INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
 (2,'JOE',300.01,0,'b2b2',1.0000009);
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -219,6 +220,9 @@
 *** Master Data Insert ***
 INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
 (2,'JOE',300.01,0);
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -323,6 +327,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+*************************************************
+** Currently giving wrong error see bug#22234 ***
+*************************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -376,6 +383,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t4 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -429,6 +439,9 @@
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t5 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
+********************************************
+*** Expect slave to fail with Error 1522 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -611,6 +624,9 @@
 3	3.00	If is does not, I will open a bug	b1b1b1b1b1b1b1b1	QA	1	CURRENT_TIMESTAMP
 *** Add column on master that is a Extra on Slave ***
 ALTER TABLE t2 ADD COLUMN c6 INT AFTER c5;
+********************************************
+*** Expect slave to fail with Error 1060 ***
+********************************************
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
--- New file ---
+++ mysql-test/t/rpl_extraCol_innodb-master.opt	06/09/11 15:33:03
--innodb

--- New file ---
+++ mysql-test/t/rpl_extraCol_innodb-slave.opt	06/09/11 15:33:09
--innodb

Thread
bk commit into 5.1 tree (jmiller:1.2256)Jonathan Miller11 Sep