From: magnus.blaudd Date: March 12 2012 3:58pm Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3443 to 3445) List-Archive: http://lists.mysql.com/commits/143166 Message-Id: <201203121558.q2CFwPQw022035@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3445 magnus.blaudd@stripped 2012-03-12 Fix faulty testname listing in disabled.def modified: mysql-test/suite/ndb/t/disabled.def 3444 magnus.blaudd@stripped 2012-03-12 [merge] Merge added: mysql-test/suite/ndb_memcache/t/disabled.def modified: mysql-test/suite/ndb/r/ndb_dd_restore_compat.result mysql-test/suite/ndb/r/ndb_gis.result mysql-test/suite/ndb/r/ndb_short_sigs.result mysql-test/suite/ndb/t/disabled.def mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result mysql-test/suite/perfschema/r/digest_table_full.result mysql-test/suite/perfschema/r/statement_digest.result mysql-test/suite/perfschema/r/statement_digest_consumers.result mysql-test/suite/perfschema/r/statement_digest_long_query.result mysql-test/suite/rpl_ndb/t/disabled.def 3443 Ole John Aske 2012-03-12 Accept new MTR result for test results changed due to WL5855 As part of WL5855: 'Print EXPLAIN in JSON format', there has been minor changes in the explain output format - Has to accept these changes in our result file. modified: mysql-test/suite/ndb/r/ndb_row_count.result mysql-test/suite/ndb/r/ndb_statistics0.result mysql-test/suite/ndb/r/ndb_statistics1.result mysql-test/suite/ndb/r/ndb_subquery.result === modified file 'mysql-test/suite/ndb/r/ndb_dd_restore_compat.result' --- a/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result 2012-01-06 13:43:48 +0000 +++ b/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result 2012-03-12 12:52:29 +0000 @@ -45,8 +45,6 @@ a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 4 5 2000000004 aaa4 34.2 04:03:02 2006-01-01 1971-05-28 16:55:03 bbbbbbbbbbbbb4 binary data 5 6 2000000005 aaa5 34.2 04:03:02 2006-01-01 1971-05-28 16:55:03 bbbbbbbbbbbbb5 binary data ALTER TABLE t1 ADD COLUMN c int; -Warnings: -Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( === modified file 'mysql-test/suite/ndb/r/ndb_gis.result' --- a/mysql-test/suite/ndb/r/ndb_gis.result 2012-03-12 08:56:56 +0000 +++ b/mysql-test/suite/ndb/r/ndb_gis.result 2012-03-12 12:52:29 +0000 @@ -435,8 +435,6 @@ mpg multipolygon YES NULL gc geometrycollection YES NULL gm geometry YES NULL ALTER TABLE t1 ADD fid INT; -Warnings: -Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN SHOW FIELDS FROM t1; Field Type Null Key Default Extra a int(11) NO PRI NULL auto_increment @@ -989,8 +987,6 @@ mpg multipolygon YES NULL gc geometrycollection YES NULL gm geometry YES NULL ALTER TABLE t1 ADD fid INT; -Warnings: -Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN SHOW FIELDS FROM t1; Field Type Null Key Default Extra a int(11) NO PRI NULL auto_increment === modified file 'mysql-test/suite/ndb/r/ndb_short_sigs.result' --- a/mysql-test/suite/ndb/r/ndb_short_sigs.result 2011-04-20 12:53:27 +0000 +++ b/mysql-test/suite/ndb/r/ndb_short_sigs.result 2012-03-12 12:52:29 +0000 @@ -63,8 +63,6 @@ th un de length(rb) length(al) 4 9 4 991 60009 5 10 5 990 60010 alter table t1 add column extra varchar(2000); -Warnings: -Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN update t1 set extra = repeat(rb, 2); select th, un, de, length(rb), length(al), length(extra) from t1 === modified file 'mysql-test/suite/ndb/t/disabled.def' --- a/mysql-test/suite/ndb/t/disabled.def 2012-02-23 12:37:59 +0000 +++ b/mysql-test/suite/ndb/t/disabled.def 2012-03-12 15:57:13 +0000 @@ -19,3 +19,20 @@ ndb_disconnect_ddl : Bug#31853 fl ndb_sql_allow_batching : SEAGULL WL3733 xxx_allow_batching ndb_dbug_lock : SEAGULL gsl locking order +ndb_alter_table : Waiting for adaption to WL#946a +ndb_dd_alter : Waiting for adaption to WL#946 +ndb_condition_pushdown : Waiting for adaption to WL#946 +ndb_dd_disk2memory : Waiting for adaption to WL#946 +ndb_dist_priv : Waiting for adaption to WL#946 +ndb_dist_priv_bug_13340854 : Waiting for adaption to WL#946 +ndb_rpl_stm_innodb : Waiting for adaption to WL#946 +ndb_index_ordered : Waiting for adaption to WL#946 +ndb_rpl_dd_advance : Waiting for adaption to WL#946 +ndb_index_stat : Waiting for adaption to WL#946 +ndb_partition_key : Waiting for adaption to WL#946 +ndb_read_multi_range : Waiting for adaption to WL#946 +ndb_restore_compat_compression : Waiting for adaption to WL#946 +ndb_restore_misc : Waiting for adaption to WL#946 +ndb_restore_schema_partitions : Waiting for adaption to WL#946 +ps_7ndb : Waiting for adaption to WL#946 + === modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result' --- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result 2011-05-30 21:13:02 +0000 +++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result 2012-03-12 12:52:29 +0000 @@ -12,8 +12,6 @@ select @max_epoch:=max(epoch)-1 from mys # delete from t1; alter table t1 add (b int); -Warnings: -Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN insert into t1 values (3,3),(4,4); alter table t1 rename t2; begin; === modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result' --- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result 2011-09-21 10:57:59 +0000 +++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result 2012-03-12 12:52:29 +0000 @@ -21,8 +21,6 @@ mysqld-bin.000001 # Query 1 # use `test` reset master; reset master; alter table t2 add column (b int); -Warnings: -Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info mysqld-bin.000001 # Query 1 # use `test`; alter table t2 add column (b int) === modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result' --- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result 2011-09-21 10:57:59 +0000 +++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result 2012-03-12 12:52:29 +0000 @@ -9,8 +9,6 @@ create table t1 (a int key, b int) engin create table t2 (a int key, b int) engine=ndb; insert into t1 values (1,1); alter table t1 add c int; -Warnings: -Warning 1478 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info reset master; === added file 'mysql-test/suite/ndb_memcache/t/disabled.def' --- a/mysql-test/suite/ndb_memcache/t/disabled.def 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/ndb_memcache/t/disabled.def 2012-03-12 14:57:47 +0000 @@ -0,0 +1,15 @@ +basic : Waiting for adaption to WL#946 +external_values : Waiting for adaption to WL#946 +lib_ascii : Waiting for adaption to WL#946 +lib_binary : Waiting for adaption to WL#946 +math1 : Waiting for adaption to WL#946 +math2 : Waiting for adaption to WL#946 +reconf1 : Waiting for adaption to WL#946 +tsv1 : Waiting for adaption to WL#946 +tsv2 : Waiting for adaption to WL#946 +ttls_flags : Waiting for adaption to WL#946 +type_char : Waiting for adaption to WL#946 +type_numeric : Waiting for adaption to WL#946 +type_signed : Waiting for adaption to WL#946 +type_unsigned : Waiting for adaption to WL#946 +unique_idx : Waiting for adaption to WL#946 === modified file 'mysql-test/suite/perfschema/r/digest_table_full.result' --- a/mysql-test/suite/perfschema/r/digest_table_full.result 2012-03-01 15:40:00 +0000 +++ b/mysql-test/suite/perfschema/r/digest_table_full.result 2012-03-12 12:18:49 +0000 @@ -76,7 +76,7 @@ SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS NULL NULL 29 21 1 2 -dee8f4f04e57a5e456c31892855e6835 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +125e2368c3eaf351aed3ebfee58be90d TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 SHOW VARIABLES LIKE "performance_schema_digests_size"; Variable_name Value performance_schema_digests_size 2 === modified file 'mysql-test/suite/perfschema/r/statement_digest.result' --- a/mysql-test/suite/perfschema/r/statement_digest.result 2012-03-01 15:40:00 +0000 +++ b/mysql-test/suite/perfschema/r/statement_digest.result 2012-03-12 12:18:49 +0000 @@ -75,28 +75,28 @@ Warning 1265 Data truncated for column ' SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS -dee8f4f04e57a5e456c31892855e6835 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 -658a159558b029617bfa7c090827fc31 SELECT ? FROM t1 1 0 0 0 -66c495c9ee7e052e0db2212a0cd7a3cd SELECT ? FROM `t1` 1 0 0 0 -e7f8dc15f1156f57978116e457cc7488 SELECT ?, ... FROM t1 2 0 0 0 -5098d41dbf74d89d261b29400c46dae7 SELECT ? FROM t2 1 0 0 0 -3b8d5477aa795a19c9e9183e4ad04e6b SELECT ?, ... FROM t2 2 0 0 0 -5737343d989b1c42464fd3632614d25e INSERT INTO t1 VALUES (?) 1 1 0 0 -1e7fe109d5dd49394ee079690a029452 INSERT INTO t2 VALUES (?) 1 1 0 0 -d63092ea2fa59316f398af6283bf80a5 INSERT INTO t3 VALUES (...) 1 1 0 0 -7383272b3a17c661872524713abae82f INSERT INTO t4 VALUES (...) 1 1 0 0 -42e8c9d8a502b06ac931886d3ff1ed1e INSERT INTO t5 VALUES (...) 1 1 0 0 -db545539039d269501474510fbc2da56 INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 -446dead39135f87b4fc4168f00dff254 INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 -3ec23fcc5b568c4ad359703ff996e0bd INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 -6b473a776aa59140774b6ee689e68c9e SELECT ? + ? 3 0 0 0 -b608da273ea6dffe2120354f751cc8ba SELECT ? 1 0 0 0 -30046d97cfdc44c95bdaa7f3987d0a20 CREATE SCHEMA statements_digest_temp 2 2 0 0 -8e40e6461f3ab4454ddb8f21b5cda3ba DROP SCHEMA statements_digest_temp 2 0 0 0 -b2a18812618a648d37136507aa1abf76 SELECT ? FROM t11 1 0 0 1 -26b3a8aaadea1ef0afd3658728b3b2c9 CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1 -fe695877d27d136594145ebd4f683491 INSERT INTO t11 VALUES (?) 1 1 1 0 -09dae9a52da4bcb4bd4f396e3f723980 SHOW WARNINGS 1 0 0 0 +125e2368c3eaf351aed3ebfee58be90d TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0 +bc4eed5041e2d6b5ded147735fbe8b1f SELECT ? FROM t1 1 0 0 0 +f65353b17370cbfb2baebad10c33fa7e SELECT ? FROM `t1` 1 0 0 0 +5d495852490f30472a5e451973f373c1 SELECT ?, ... FROM t1 2 0 0 0 +b71eb7d7c299dfc30efdd68528f59a76 SELECT ? FROM t2 1 0 0 0 +ceee8936a87a0f5175734f5f10e7057c SELECT ?, ... FROM t2 2 0 0 0 +8706d275b70cc0e0be3278bcfd11425b INSERT INTO t1 VALUES (?) 1 1 0 0 +078618f67231c7030acb33e57a83cfd8 INSERT INTO t2 VALUES (?) 1 1 0 0 +8ad1b5c85b289e58d0f7b427da91a6ce INSERT INTO t3 VALUES (...) 1 1 0 0 +d66ea0477cde3db52d29b929fb1d2aca INSERT INTO t4 VALUES (...) 1 1 0 0 +dbe42331568bef0faca4a83edb21e87b INSERT INTO t5 VALUES (...) 1 1 0 0 +a9ae07204bf4a980fdb9e735c8b5efaa INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0 +15bad11ceed55668da6a92334afc07e9 INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0 +56b93d153e0ee2c70de8306ef1fb8d18 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0 +9dc07462e059ac4602d4c14545dc0fe8 SELECT ? + ? 3 0 0 0 +52d466db2e44df4a904d2800fc3af99e SELECT ? 1 0 0 0 +fb40aece1f68b5c3fbaf220bc21ad353 CREATE SCHEMA statements_digest_temp 2 2 0 0 +622ef9323ed99ee165d79477219a693b DROP SCHEMA statements_digest_temp 2 0 0 0 +ce88fbaf7c72c8f2e1efeb16b9cf0f74 SELECT ? FROM t11 1 0 0 1 +7627748ac774cc7db2d160ea197a1d20 CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1 +13090b5cd13a544b442804d16f8fe1f9 INSERT INTO t11 VALUES (?) 1 1 1 0 +bc929dc8b518d3e83c072ea8a2aa485c SHOW WARNINGS 1 0 0 0 #################################### # CLEANUP #################################### === modified file 'mysql-test/suite/perfschema/r/statement_digest_consumers.result' --- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result 2012-03-01 15:40:00 +0000 +++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result 2012-03-12 12:18:49 +0000 @@ -88,28 +88,28 @@ Warning 1265 Data truncated for column ' #################################### SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; digest digest_text count_star -dee8f4f04e57a5e456c31892855e6835 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 -658a159558b029617bfa7c090827fc31 SELECT ? FROM t1 1 -66c495c9ee7e052e0db2212a0cd7a3cd SELECT ? FROM `t1` 1 -e7f8dc15f1156f57978116e457cc7488 SELECT ?, ... FROM t1 2 -5098d41dbf74d89d261b29400c46dae7 SELECT ? FROM t2 1 -3b8d5477aa795a19c9e9183e4ad04e6b SELECT ?, ... FROM t2 2 -5737343d989b1c42464fd3632614d25e INSERT INTO t1 VALUES (?) 1 -1e7fe109d5dd49394ee079690a029452 INSERT INTO t2 VALUES (?) 1 -d63092ea2fa59316f398af6283bf80a5 INSERT INTO t3 VALUES (...) 1 -7383272b3a17c661872524713abae82f INSERT INTO t4 VALUES (...) 1 -42e8c9d8a502b06ac931886d3ff1ed1e INSERT INTO t5 VALUES (...) 1 -db545539039d269501474510fbc2da56 INSERT INTO t1 VALUES (?) /* , ... */ 2 -446dead39135f87b4fc4168f00dff254 INSERT INTO t3 VALUES (...) /* , ... */ 1 -3ec23fcc5b568c4ad359703ff996e0bd INSERT INTO t5 VALUES (...) /* , ... */ 1 -6b473a776aa59140774b6ee689e68c9e SELECT ? + ? 3 -b608da273ea6dffe2120354f751cc8ba SELECT ? 1 -30046d97cfdc44c95bdaa7f3987d0a20 CREATE SCHEMA statements_digest_temp 2 -8e40e6461f3ab4454ddb8f21b5cda3ba DROP SCHEMA statements_digest_temp 2 -b2a18812618a648d37136507aa1abf76 SELECT ? FROM t11 1 -26b3a8aaadea1ef0afd3658728b3b2c9 CREATE TABLE t11 ( c CHARACTER (?) ) 2 -fe695877d27d136594145ebd4f683491 INSERT INTO t11 VALUES (?) 1 -09dae9a52da4bcb4bd4f396e3f723980 SHOW WARNINGS 1 +125e2368c3eaf351aed3ebfee58be90d TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 +bc4eed5041e2d6b5ded147735fbe8b1f SELECT ? FROM t1 1 +f65353b17370cbfb2baebad10c33fa7e SELECT ? FROM `t1` 1 +5d495852490f30472a5e451973f373c1 SELECT ?, ... FROM t1 2 +b71eb7d7c299dfc30efdd68528f59a76 SELECT ? FROM t2 1 +ceee8936a87a0f5175734f5f10e7057c SELECT ?, ... FROM t2 2 +8706d275b70cc0e0be3278bcfd11425b INSERT INTO t1 VALUES (?) 1 +078618f67231c7030acb33e57a83cfd8 INSERT INTO t2 VALUES (?) 1 +8ad1b5c85b289e58d0f7b427da91a6ce INSERT INTO t3 VALUES (...) 1 +d66ea0477cde3db52d29b929fb1d2aca INSERT INTO t4 VALUES (...) 1 +dbe42331568bef0faca4a83edb21e87b INSERT INTO t5 VALUES (...) 1 +a9ae07204bf4a980fdb9e735c8b5efaa INSERT INTO t1 VALUES (?) /* , ... */ 2 +15bad11ceed55668da6a92334afc07e9 INSERT INTO t3 VALUES (...) /* , ... */ 1 +56b93d153e0ee2c70de8306ef1fb8d18 INSERT INTO t5 VALUES (...) /* , ... */ 1 +9dc07462e059ac4602d4c14545dc0fe8 SELECT ? + ? 3 +52d466db2e44df4a904d2800fc3af99e SELECT ? 1 +fb40aece1f68b5c3fbaf220bc21ad353 CREATE SCHEMA statements_digest_temp 2 +622ef9323ed99ee165d79477219a693b DROP SCHEMA statements_digest_temp 2 +ce88fbaf7c72c8f2e1efeb16b9cf0f74 SELECT ? FROM t11 1 +7627748ac774cc7db2d160ea197a1d20 CREATE TABLE t11 ( c CHARACTER (?) ) 2 +13090b5cd13a544b442804d16f8fe1f9 INSERT INTO t11 VALUES (?) 1 +bc929dc8b518d3e83c072ea8a2aa485c SHOW WARNINGS 1 SELECT digest, digest_text FROM performance_schema.events_statements_current; digest digest_text #################################### === modified file 'mysql-test/suite/perfschema/r/statement_digest_long_query.result' --- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result 2012-03-01 15:40:00 +0000 +++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result 2012-03-12 12:18:49 +0000 @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest; digest digest_text count_star -56ae4a1bea5f5babaa469039be3fd979 TRUNCATE TABLE events_statements_summary_by_digest 1 -abda1fecf4bb4811f508a861272700a8 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ! ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1 +154c5a0a85343c653c1192dd31be1dd3 TRUNCATE TABLE events_statements_summary_by_digest 1 +62e6f6c43d705d93aef962fdc8ccd803 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ! ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1 === modified file 'mysql-test/suite/rpl_ndb/t/disabled.def' --- a/mysql-test/suite/rpl_ndb/t/disabled.def 2012-02-13 21:10:43 +0000 +++ b/mysql-test/suite/rpl_ndb/t/disabled.def 2012-03-12 15:09:11 +0000 @@ -12,4 +12,7 @@ rpl_ndb_set_null : bug #51100 rpl_ndb_row_implicit_commit_binlog : BUG#12586131 - fails on SET PASSWORD +rpl_ndb_dist_priv : Waiting for adaption to WL#946 +rpl_ndb_extra_col_master : Waiting for adaption to WL#946 +rpl_ndb_extra_col_slave : Waiting for adaption to WL#946 No bundle (reason: useless for push emails).