bk commit into 5.1 tree (mkindahl:1.2530)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-04 12:12:03+01:00, mkindahl@stripped +2 -0
  More fixes to remove test failures in pushbuild.

  mysql-test/suite/rpl/r/rpl_row_trig001.result@stripped, 2008-02-04 12:11:46+01:00, mkindahl@stripped +2 -1
    Result change.

  mysql-test/suite/rpl/t/rpl_row_trig001.test@stripped, 2008-02-04 12:11:52+01:00, mkindahl@stripped +12 -1
    Correcting a typo and trying to avoid a race condition when
    dumping the contents of the master and slave for comparison.

diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_trig001.result b/mysql-test/suite/rpl/r/rpl_row_trig001.result
--- a/mysql-test/suite/rpl/r/rpl_row_trig001.result	2007-06-27 14:27:24 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_trig001.result	2008-02-04 12:11:46 +01:00
@@ -8,7 +8,7 @@ CREATE TABLE test.t1 (n MEDIUMINT NOT NU
 CREATE TABLE test.t2 (n MEDIUMINT NOT NULL AUTO_INCREMENT, f FLOAT, d DATETIME, PRIMARY KEY(n));
 CREATE TABLE test.t3 (n MEDIUMINT NOT NULL AUTO_INCREMENT, d DATETIME, PRIMARY KEY(n));
 INSERT INTO test.t1 VALUES (1,NOW());
-CREATE TRIGGER test.t2_ai AFTER INSERT ON test.t2 FOR EACH ROW UPDATE test.t1 SET d=NOW() where n = 1;//
+CREATE TRIGGER test.t2_ai AFTER INSERT ON test.t2 FOR EACH ROW UPDATE test.t1 SET d=NOW() where n = 1//
 CREATE PROCEDURE test.p3()
 BEGIN
 INSERT INTO test.t3 (d) VALUES (NOW());
@@ -18,6 +18,7 @@ CREATE PROCEDURE test.p2()
 BEGIN
 INSERT INTO test.t2 (f,d) VALUES (RAND(),NOW());
 END//
+INSERT INTO test.t1 VALUES (1+1, NOW());
 
 <End test section 2 (Tiggers & SP)>
 -----------------------------------
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_trig001.test b/mysql-test/suite/rpl/t/rpl_row_trig001.test
--- a/mysql-test/suite/rpl/t/rpl_row_trig001.test	2007-12-06 16:26:59 +01:00
+++ b/mysql-test/suite/rpl/t/rpl_row_trig001.test	2008-02-04 12:11:52 +01:00
@@ -39,7 +39,7 @@ CREATE TABLE test.t3 (n MEDIUMINT NOT NU
 INSERT INTO test.t1 VALUES (1,NOW());
 
 delimiter //;
-CREATE TRIGGER test.t2_ai AFTER INSERT ON test.t2 FOR EACH ROW UPDATE test.t1 SET d=NOW() where n = 1;//
+CREATE TRIGGER test.t2_ai AFTER INSERT ON test.t2 FOR EACH ROW UPDATE test.t1 SET d=NOW() where n = 1//
 CREATE PROCEDURE test.p3()
 BEGIN
  INSERT INTO test.t3 (d) VALUES (NOW());
@@ -51,6 +51,10 @@ BEGIN
 END//
 delimiter ;//
 
+# Make sure that all definition have propagated to the slave
+sync_slave_with_master;
+
+connection master;
 -- disable_query_log
 -- disable_result_log
 SET @wait_count = 1;
@@ -66,6 +70,13 @@ while ($1)
 }
 -- enable_result_log
 -- enable_query_log
+
+# Just a precaution to make sure all changes have made it over to the
+# slave
+connection master;
+let $count = `select count(*) from t1`;
+eval INSERT INTO test.t1 VALUES ($count+1, NOW());
+sync_slave_with_master;
 
 #show binlog events; 
 #select * from test.t2;