bzr commit into mysql-trunk branch (andrei.elkin:3702) Bug#11766160

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ based on revid:ole.john.aske@stripped

 3702 Andrei Elkin	2011-02-22 [merge]
      bug#11766160 Test rpl.rpl_stm_000001 fail on Valgrind with binlog-checksum enabled
      
      merging from local bugfixing branch to refer to the bug id in the Oracle's scale.

    modified:
      mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/t/rpl_stm_000001.test
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_000001.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_000001.result	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_000001.result	2011-02-22 07:52:45 +0000
@@ -34,6 +34,7 @@ create table t1 (n int) engine=myisam;
 reset master;
 stop slave;
 reset slave;
+# Asserted this: We should have generated greater than 16 KB relay log
 lock tables t1 read;
 start slave;
 include/sync_slave_io_with_master.inc
@@ -52,7 +53,7 @@ Got one of the listed errors
 include/wait_for_slave_sql_error_and_skip.inc [errno=1053]
 select count(*) from t1;
 count(*)
-5000
+100
 drop table t1;
 create table t1 (n int);
 insert into t1 values(3456);

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_000001.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_000001.test	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_000001.test	2011-02-22 07:52:45 +0000
@@ -54,8 +54,9 @@ stop slave;
 reset slave;
 
 connection master;
-let $1=5000;
+let $1=100;
 # Generate 16K of relay log
+--let $pos= query_get_value(SHOW MASTER STATUS, Position, 1)
 disable_query_log;
 while ($1)
 {
@@ -64,6 +65,10 @@ while ($1)
 }
 enable_query_log;
 
+--let $assert_text= We should have generated greater than 16 KB relay log
+--let $assert_cond= [SHOW MASTER STATUS, Position, 1] - $pos > 16384
+--source include/rpl_assert.inc
+
 # Try to cause a large relay log lag on the slave by locking t1
 connection slave;
 lock tables t1 read;


Attachment: [text/bzr-bundle] bzr/[e-mail]