diff options
author | unknown <mkindahl@dl145h.mysql.com> | 2008-02-04 12:12:03 +0100 |
---|---|---|
committer | unknown <mkindahl@dl145h.mysql.com> | 2008-02-04 12:12:03 +0100 |
commit | 4a52cbaa2e377dc4cb1b97f8399b09a060085919 (patch) | |
tree | 895681eb3a13adb128fb94ffa3d5dc789c5d178d | |
parent | b14b7fc3d75136971841648a8eef71d0344f5298 (diff) | |
download | mariadb-git-4a52cbaa2e377dc4cb1b97f8399b09a060085919.tar.gz |
More fixes to remove test failures in pushbuild.
mysql-test/suite/rpl/r/rpl_row_trig001.result:
Result change.
mysql-test/suite/rpl/t/rpl_row_trig001.test:
Correcting a typo and trying to avoid a race condition when
dumping the contents of the master and slave for comparison.
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_trig001.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/rpl/t/rpl_row_trig001.test | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_row_trig001.result b/mysql-test/suite/rpl/r/rpl_row_trig001.result index 6665dc6d555..ea0ef27fccd 100644 --- a/mysql-test/suite/rpl/r/rpl_row_trig001.result +++ b/mysql-test/suite/rpl/r/rpl_row_trig001.result @@ -8,7 +8,7 @@ CREATE TABLE test.t1 (n MEDIUMINT NOT NULL, d DATETIME, PRIMARY KEY(n)); 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 --git a/mysql-test/suite/rpl/t/rpl_row_trig001.test b/mysql-test/suite/rpl/t/rpl_row_trig001.test index 83d0f03301d..8669034713a 100644 --- a/mysql-test/suite/rpl/t/rpl_row_trig001.test +++ b/mysql-test/suite/rpl/t/rpl_row_trig001.test @@ -39,7 +39,7 @@ CREATE TABLE test.t3 (n MEDIUMINT NOT NULL AUTO_INCREMENT, d DATETIME, PRIMARY K 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; @@ -67,6 +71,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; #select * from test.t3; |