diff options
| author | Sven Sandberg <sven@mysql.com> | 2008-07-14 16:06:03 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven@mysql.com> | 2008-07-14 16:06:03 +0200 |
| commit | 6e234d0ddac6320ca4e5e87b6709fcee1e01e0ff (patch) | |
| tree | 5a0df78954a592a1df793501833b80100d003334 /mysql-test/suite/rpl_ndb/r | |
| parent | 815ee42b3fd36837c0b8b8e26dcab519960673d8 (diff) | |
| download | mariadb-git-6e234d0ddac6320ca4e5e87b6709fcee1e01e0ff.tar.gz | |
BUG#37975: wait_for_slave_* should increase the timeout
Post-push fixes: forgot to commit an updated result file.
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
Updated result file.
Diffstat (limited to 'mysql-test/suite/rpl_ndb/r')
| -rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result index a840f059439..8b480df8d0c 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -stop slave; +include/stop_slave.inc reset master; reset slave; reset master; @@ -117,11 +117,7 @@ Aberdeen Abernathy aberrant aberration -start slave; - -let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ; - ---source include/wait_slave_status.inc +include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -194,7 +190,8 @@ Abernathy aberrant aberration flush logs; -stop slave; +include/stop_slave.inc +include/start_slave.inc create table t2 (n int)ENGINE=NDB; insert into t2 values (1); show binlog events from <binlog_start>; @@ -230,7 +227,6 @@ show binary logs; Log_name File_size master-bin.000001 1760 master-bin.000002 623 -start slave; show binary logs; Log_name File_size slave-bin.000001 1855 |