diff options
| author | unknown <guilhem@mysql.com> | 2004-05-14 23:08:03 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-05-14 23:08:03 +0200 |
| commit | 028a672fd6d82a1a831bbfc16838bbe33c381d48 (patch) | |
| tree | 8266d0c50d10458d6ad44954c5518e653150b8e6 /mysql-test | |
| parent | 72595adab2185307c4fc9e9d028ac2e340e27ab8 (diff) | |
| download | mariadb-git-028a672fd6d82a1a831bbfc16838bbe33c381d48.tar.gz | |
Replication testsuite: making the master-slave synchronization less likely to fail,
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
client/mysqltest.c:
in sync_with_master (and sync_slave_with_master), if MASTER_POS_WAIT() returns NULL,
it may be that the slave SQL thread did not have time to start yes, so we sleep
1 sec and retry, 4 times at most.
mysql-test/r/rpl_server_id2.result:
result update
mysql-test/t/rpl_server_id2.test:
master_slave.inc already drops the table
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_server_id2.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_server_id2.test | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result index d665bb25dbb..1b5d946998c 100644 --- a/mysql-test/r/rpl_server_id2.result +++ b/mysql-test/r/rpl_server_id2.result @@ -4,7 +4,6 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; slave start; -drop table if exists t1; create table t1 (n int); reset master; stop slave; diff --git a/mysql-test/t/rpl_server_id2.test b/mysql-test/t/rpl_server_id2.test index dc8f733b7ed..7bbac358ada 100644 --- a/mysql-test/t/rpl_server_id2.test +++ b/mysql-test/t/rpl_server_id2.test @@ -3,7 +3,6 @@ source include/master-slave.inc; connection slave; -drop table if exists t1; create table t1 (n int); reset master; # replicate ourselves |