bzr commit into mysql-5.1-rpl branch (luis.soares:2719) Bug#42370

[Luis Soares]

#At file:///home/lsoares/Workspace/mysql-server/bugfix/42370/5.1-rpl/

 2719 Luis Soares	2009-01-27
      BUG#42370: rpl_trigger.test: Test case timeout after 900 seconds
      
      The test fails with timeout when applying diff on two tables.
      
      In this test case, there can be a situation when the slave is not yet synced
      with the master, thence the changes may not be on the slave at diff time.
      
      This patch addresses this issue by synchronizing master and slave before the
      diff takes place.
modified:
  mysql-test/suite/rpl/t/rpl_trigger.test

=== modified file 'mysql-test/suite/rpl/t/rpl_trigger.test'
--- a/mysql-test/suite/rpl/t/rpl_trigger.test	2009-01-23 12:22:05 +0000
+++ b/mysql-test/suite/rpl/t/rpl_trigger.test	2009-01-27 11:32:16 +0000
@@ -498,6 +498,7 @@ create trigger tr
 set autocommit = 0;
 insert into t1 values ( 1 );
 rollback;
+sync_slave_with_master;
 
 let $diff_table_1=master:test.t1;
 let $diff_table_2=slave:test.t1;