From 9eedf9b4526b83ec6e310fae768273b4ea042e14 Mon Sep 17 00:00:00 2001 From: Luis Soares Date: Mon, 12 Mar 2012 23:15:01 +0000 Subject: [PATCH] BUG#12400313 Hardening the test case: - including a diff_tables at the end. - increasing the tolerance on the relay limit size. --- mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result | 1 + mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result b/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result index cbef4231798..7820f1ef97f 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result +++ b/mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result @@ -1,4 +1,5 @@ include/master-slave.inc [connection master] include/assert.inc [Assert that relay log space is close to the limit] +include/diff_tables.inc [master:test.t1,slave:test.t1] include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test b/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test index afe9f8575d3..2b10da00f76 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test +++ b/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test @@ -82,12 +82,16 @@ INSERT INTO t1 VALUES ('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx --let $relay_log_space_while_sql_is_executing = query_get_value(SHOW SLAVE STATUS, Relay_Log_Space, 1) --let $relay_log_space_limit = query_get_value(SHOW VARIABLES LIKE "relay_log_space_limit", Value, 1) --let $assert_text= Assert that relay log space is close to the limit ---let $assert_cond= $relay_log_space_while_sql_is_executing <= $relay_log_space_limit * 1.1 +--let $assert_cond= $relay_log_space_while_sql_is_executing <= $relay_log_space_limit * 1.15 --source include/assert.inc # unlock the table and let SQL thread continue applying events UNLOCK TABLES; +--connection master +--let $diff_tables=master:test.t1,slave:test.t1 +--source include/diff_tables.inc + --connection master DROP TABLE t1; --enable_query_log