From: Frazer Clement Date: December 21 2012 4:50pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (frazer.clement:4150 to 4151) Bug#16029263 List-Archive: http://lists.mysql.com/commits/145549 X-Bug: 16029263 Message-Id: <201212211651.qBLGp0QR004486@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4151 Frazer Clement 2012-12-21 BUG#16029263 NDB SLAVE BATCHING, REPLICATION AND KEYLESS TABLES Temporary patch disabling testcase failing in 7.2 due to above bug. Note that this is *Not* a fix. modified: mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result 4150 Mauritz Sundell 2012-12-19 [merge] merge 7.01 -> 7.2 added: mysql-test/suite/ndb/r/ndb_one_fragment.result mysql-test/suite/ndb/t/ndb_one_fragment.cnf mysql-test/suite/ndb/t/ndb_one_fragment.test modified: storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp storage/ndb/src/kernel/vm/LHLevel.hpp === modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test' --- a/mysql-test/extra/rpl_tests/rpl_row_basic.test 2012-06-07 19:43:43 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test 2012-12-21 16:46:04 +0000 @@ -494,6 +494,13 @@ connection master; drop table t1; sync_slave_with_master; +# MCP_BUG16029263 +# NDB SLAVE BATCHING, REPLICATION AND KEYLESS TABLES +# Skip the below tests for NDB since they have no PK +# and are thus not supported by NDB +if (`SELECT $type != 'NDB'`) +{ + # # Bug #38230 Differences between master and slave after # UPDATE or DELETE with LIMIT with pk @@ -683,3 +690,7 @@ source include/diff_tables.inc; connection master; drop table t1; sync_slave_with_master; + +} # End of tests not supported by NDB +STOP SLAVE; # MCP_BUG16029263 +# MCP_BUG16029263 \ No newline at end of file === modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result' --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result 2012-02-13 21:10:43 +0000 +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result 2012-12-21 16:46:04 +0000 @@ -510,116 +510,4 @@ ERROR 23000: Duplicate entry '10' for ke INSERT INTO t1 VALUES (4); include/diff_tables.inc [master:t1, slave:t1] drop table t1; -DROP TABLE IF EXISTS t1, t2; -CREATE TABLE t1 ( -`pk` int(11) NOT NULL AUTO_INCREMENT, -`int_nokey` int(11) NOT NULL, -`int_key` int(11) NOT NULL, -`date_key` date NOT NULL, -`date_nokey` date NOT NULL, -`time_key` time NOT NULL, -`time_nokey` time NOT NULL, -`datetime_key` datetime NOT NULL, -`datetime_nokey` datetime NOT NULL, -`varchar_key` varchar(1) NOT NULL, -`varchar_nokey` varchar(1) NOT NULL, -PRIMARY KEY (`pk`), -KEY `int_key` (`int_key`), -KEY `date_key` (`date_key`), -KEY `time_key` (`time_key`), -KEY `datetime_key` (`datetime_key`), -KEY `varchar_key` (`varchar_key`) -) ENGINE='NDB' ; -INSERT INTO t1 VALUES (1,8,5,'0000-00-00','0000-00-00','10:37:38','10:37:38','0000-00-00 00:00:00','0000-00-00 00:00:00','p','p'),(2,0,9,'0000-00-00','0000-00-00','00:00:00','00:00:00','2007-10-14 00:00:00','2007-10-14 00:00:00','d','d'); -CREATE TABLE t2 ( -`pk` int(11) NOT NULL AUTO_INCREMENT, -`int_nokey` int(11) NOT NULL, -`int_key` int(11) NOT NULL, -`date_key` date NOT NULL, -`date_nokey` date NOT NULL, -`time_key` time NOT NULL, -`time_nokey` time NOT NULL, -`datetime_key` datetime NOT NULL, -`datetime_nokey` datetime NOT NULL, -`varchar_key` varchar(1) NOT NULL, -`varchar_nokey` varchar(1) NOT NULL, -PRIMARY KEY (`pk`), -KEY `int_key` (`int_key`), -KEY `date_key` (`date_key`), -KEY `time_key` (`time_key`), -KEY `datetime_key` (`datetime_key`), -KEY `varchar_key` (`varchar_key`) -) ENGINE='NDB' ; -INSERT INTO t2 VALUES (1,1,6,'2005-12-23','2005-12-23','02:24:28','02:24:28','0000-00-00 00:00:00','0000-00-00 00:00:00','g','g'),(2,0,3,'2009-09-14','2009-09-14','00:00:00','00:00:00','2000-01-30 16:39:40','2000-01-30 16:39:40','q','q'),(3,0,3,'0000-00-00','0000-00-00','00:00:00','00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','c','c'),(4,1,6,'2007-03-29','2007-03-29','15:49:00','15:49:00','0000-00-00 00:00:00','0000-00-00 00:00:00','m','m'),(5,4,0,'2002-12-04','2002-12-04','00:00:00','00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','o','o'),(6,9,0,'2005-01-28','2005-01-28','00:00:00','00:00:00','2001-05-18 00:00:00','2001-05-18 00:00:00','w','w'),(7,6,0,'0000-00-00','0000-00-00','06:57:25','06:57:25','0000-00-00 00:00:00','0000-00-00 00:00:00','m','m'),(8,0,0,'0000-00-00','0000-00-00','00:00:00','00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','z','z'),(9,4,6,'2006-08-15','2006-08-15','00:00:00','00:00:00','2002-04-12 14:44:25','2002-04-12 14:44:25','j'! ,'j'),(10,0,5,'2006-12-20','2006-12-20','10:13:53','10:13:53','2008-07-22 00:00:00','2008-07-22 00:00:00','y','y'),(11,9,7,'0000-00-00','0000-00-00','00:00:00','00:00:00','2004-07-05 00:00:00','2004-07-05 00:00:00','{','{'),(12,4,3,'2007-01-26','2007-01-26','23:00:51','23:00:51','2001-05-16 00:00:00','2001-05-16 00:00:00','f','f'),(13,7,0,'2004-03-27','2004-03-27','00:00:00','00:00:00','2005-01-24 03:30:37','2005-01-24 03:30:37','',''),(14,6,0,'2006-07-26','2006-07-26','18:43:57','18:43:57','0000-00-00 00:00:00','0000-00-00 00:00:00','{','{'),(15,0,6,'2000-01-14','2000-01-14','00:00:00','00:00:00','2000-09-21 00:00:00','2000-09-21 00:00:00','o','o'),(16,9,8,'0000-00-00','0000-00-00','21:15:08','21:15:08','0000-00-00 00:00:00','0000-00-00 00:00:00','a','a'),(17,2,0,'2004-10-27','2004-10-27','00:00:00','00:00:00','2004-03-24 22:13:43','2004-03-24 22:13:43','',''),(18,7,4,'0000-00-00','0000-00-00','08:38:27','08:38:27','2002-03-18 19:51:44','2002-03-18 19:51:44','t','t'),(19,5! ,3,'2008-03-07','2008-03-07','03:29:07','03:29:07','2007-12-01! 18:44:4 4','2007-12-01 18:44:44','t','t'),(20,0,0,'2002-04-09','2002-04-09','16:06:03','16:06:03','2009-04-22 00:00:00','2009-04-22 00:00:00','n','n'); -DELETE FROM t2 WHERE `int_key` < 3 LIMIT 1; -UPDATE t1 SET `int_key` = 3 ORDER BY `pk` LIMIT 4; -DELETE FROM t2 WHERE `int_key` < 3 LIMIT 1; -DELETE FROM t2 WHERE `pk` < 6 LIMIT 1; -UPDATE t1 SET `int_key` = 6 ORDER BY `pk` LIMIT 3; -DELETE FROM t2 WHERE `pk` < 6 LIMIT 1; -UPDATE t1 SET `pk` = 6 ORDER BY `int_key` LIMIT 6; -ERROR 23000: Duplicate entry '6' for key 'PRIMARY' -DELETE FROM t2 WHERE `pk` < 7 LIMIT 1; -UPDATE t1 SET `int_key` = 4 ORDER BY `pk` LIMIT 6; -*** results: t2 must be consistent **** -include/diff_tables.inc [master:t2, slave:t2] -DROP TABLE t1, t2; -EOF OF TESTS -CREATE TABLE t1 (a int) ENGINE='NDB' ; -INSERT IGNORE INTO t1 VALUES (NULL); -INSERT INTO t1 ( a ) VALUES ( 0 ); -INSERT INTO t1 ( a ) VALUES ( 9 ); -INSERT INTO t1 ( a ) VALUES ( 2 ); -INSERT INTO t1 ( a ) VALUES ( 9 ); -INSERT INTO t1 ( a ) VALUES ( 5 ); -UPDATE t1 SET a = 5 WHERE a = 9; -DELETE FROM t1 WHERE a < 6; -UPDATE t1 SET a = 9 WHERE a < 3; -INSERT INTO t1 ( a ) VALUES ( 3 ); -UPDATE t1 SET a = 0 WHERE a < 4; -UPDATE t1 SET a = 8 WHERE a < 5; -include/diff_tables.inc [master:t1, slave:t1] -drop table t1; -CREATE TABLE t1 (a bit) ENGINE='NDB' ; -INSERT IGNORE INTO t1 VALUES (NULL); -INSERT INTO t1 ( a ) VALUES ( 0 ); -UPDATE t1 SET a = 0 WHERE a = 1 LIMIT 3; -INSERT INTO t1 ( a ) VALUES ( 5 ); -DELETE FROM t1 WHERE a < 2 LIMIT 4; -DELETE FROM t1 WHERE a < 9 LIMIT 4; -INSERT INTO t1 ( a ) VALUES ( 9 ); -UPDATE t1 SET a = 8 WHERE a = 0 LIMIT 6; -INSERT INTO t1 ( a ) VALUES ( 8 ); -UPDATE t1 SET a = 0 WHERE a < 6 LIMIT 0; -INSERT INTO t1 ( a ) VALUES ( 4 ); -INSERT INTO t1 ( a ) VALUES ( 3 ); -UPDATE t1 SET a = 0 WHERE a = 7 LIMIT 6; -DELETE FROM t1 WHERE a = 4 LIMIT 7; -UPDATE t1 SET a = 9 WHERE a < 2 LIMIT 9; -UPDATE t1 SET a = 0 WHERE a < 9 LIMIT 2; -DELETE FROM t1 WHERE a < 0 LIMIT 5; -INSERT INTO t1 ( a ) VALUES ( 5 ); -UPDATE t1 SET a = 4 WHERE a < 6 LIMIT 4; -INSERT INTO t1 ( a ) VALUES ( 5 ); -UPDATE t1 SET a = 9 WHERE a < 5 LIMIT 8; -DELETE FROM t1 WHERE a < 8 LIMIT 8; -INSERT INTO t1 ( a ) VALUES ( 6 ); -DELETE FROM t1 WHERE a < 6 LIMIT 7; -UPDATE t1 SET a = 7 WHERE a = 3 LIMIT 7; -UPDATE t1 SET a = 8 WHERE a = 0 LIMIT 6; -INSERT INTO t1 ( a ) VALUES ( 7 ); -DELETE FROM t1 WHERE a < 9 LIMIT 4; -INSERT INTO t1 ( a ) VALUES ( 7 ); -INSERT INTO t1 ( a ) VALUES ( 6 ); -UPDATE t1 SET a = 8 WHERE a = 3 LIMIT 4; -DELETE FROM t1 WHERE a = 2 LIMIT 9; -DELETE FROM t1 WHERE a = 1 LIMIT 4; -UPDATE t1 SET a = 4 WHERE a = 2 LIMIT 7; -INSERT INTO t1 ( a ) VALUES ( 0 ); -DELETE FROM t1 WHERE a < 3 LIMIT 0; -UPDATE t1 SET a = 8 WHERE a = 5 LIMIT 2; -INSERT INTO t1 ( a ) VALUES ( 1 ); -UPDATE t1 SET a = 9 WHERE a < 5 LIMIT 3; -include/diff_tables.inc [master:t1, slave:t1] -drop table t1; -include/rpl_end.inc +STOP SLAVE; No bundle (reason: useless for push emails).