diff options
| author | unknown <svoj@april.(none)> | 2008-03-14 17:54:17 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2008-03-14 17:54:17 +0400 |
| commit | addeb300d6eadc8425892042d06eb73d81031e3e (patch) | |
| tree | f2e2b2f6cfd3e014b866c8b1ae53569e32bf5183 | |
| parent | 7eae435163661291171f965cde446eece69e6102 (diff) | |
| parent | db911b4c67bca66447ce672b4ba088f7443789be (diff) | |
| download | mariadb-git-addeb300d6eadc8425892042d06eb73d81031e3e.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
SCCS merged
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_dual_pos_advance.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_dual_pos_advance.test | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result b/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result index 97ca8101c33..4c6323a61db 100644 --- a/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result +++ b/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result @@ -25,9 +25,6 @@ insert into t3 values(4); start slave until master_log_file="slave-bin.000001",master_log_pos=195; Warnings: Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart -select master_pos_wait("slave-bin.000001",137); -master_pos_wait("slave-bin.000001",137) -0 show tables; Tables_in_test t1 diff --git a/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test b/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test index d51b175ca00..7ab9064b7f6 100644 --- a/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test +++ b/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test @@ -66,12 +66,6 @@ connection master; # asking it to stop before creation of t3. start slave until master_log_file="slave-bin.000001",master_log_pos=195; - -# wait until it's started (the position below is the start of "CREATE -# TABLE t2") (otherwise wait_for_slave_sql_to_stop may return at once) - -select master_pos_wait("slave-bin.000001",137); - --source include/wait_for_slave_sql_to_stop.inc # then BUG#13861 causes t3 to show up below (because stopped too |