diff options
| author | Luis Soares <luis.soares@oracle.com> | 2012-03-12 23:16:44 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2012-03-12 23:16:44 +0000 |
| commit | deb49a268303217372ddf1aa7a027441689fb126 (patch) | |
| tree | dfb051c1382dfcc0eeb91f33e7f23aee619ef86d /mysql-test | |
| parent | c41a6fec10d043a85a2e5882cc8c259aee867f07 (diff) | |
| parent | ab03c5bace3a091e2678f9ec2ba323426a6a7b3d (diff) | |
| download | mariadb-git-deb49a268303217372ddf1aa7a027441689fb126.tar.gz | |
Automerge merge with latest mysql-5.1.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test | 6 |
2 files changed, 6 insertions, 1 deletions
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,13 +82,17 @@ 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 --sync_slave_with_master |