diff options
| author | unknown <mats@mats-laptop.(none)> | 2008-05-12 20:01:10 +0200 |
|---|---|---|
| committer | unknown <mats@mats-laptop.(none)> | 2008-05-12 20:01:10 +0200 |
| commit | d2a75dc900fb45de27a749d030865e9f95f9e57b (patch) | |
| tree | 53f735b9003b7bae903b2f1291247653c0a818e7 /mysql-test/suite/rpl | |
| parent | 24d9bbad70cf7674fad22378023db2ff967c4e5c (diff) | |
| parent | dac6ffb9582187e47a29b0717c8e279dcd70fb81 (diff) | |
| download | mariadb-git-d2a75dc900fb45de27a749d030865e9f95f9e57b.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bug36197
into mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_found_rows.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_found_rows.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_slave_status.test | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_found_rows.result b/mysql-test/suite/rpl/r/rpl_found_rows.result index 7e757a1d141..25be9eb63b3 100644 --- a/mysql-test/suite/rpl/r/rpl_found_rows.result +++ b/mysql-test/suite/rpl/r/rpl_found_rows.result @@ -226,7 +226,7 @@ sect test count 2 6 0 2 6 183 2 7 0 -DROP TABLE t1, logtbl; +DROP TABLE t1, t2, logtbl; DROP PROCEDURE just_log; DROP PROCEDURE log_me; DROP PROCEDURE log_me_inner; diff --git a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result index 71c825183f7..1dd97878666 100644 --- a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result +++ b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result @@ -37,7 +37,7 @@ Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 1146 -Last_Error Error 'Table 'test.t1' doesn't exist' on opening table `test`.`t1` +Last_Error Error 'Table 'test.t1' doesn't exist' on opening tables Skip_Counter 0 Exec_Master_Log_Pos 941 Relay_Log_Space # @@ -55,5 +55,5 @@ Master_SSL_Verify_Server_Cert No Last_IO_Errno # Last_IO_Error # Last_SQL_Errno 1146 -Last_SQL_Error Error 'Table 'test.t1' doesn't exist' on opening table `test`.`t1` +Last_SQL_Error Error 'Table 'test.t1' doesn't exist' on opening tables drop table t1, t2; diff --git a/mysql-test/suite/rpl/t/rpl_found_rows.test b/mysql-test/suite/rpl/t/rpl_found_rows.test index f868061c951..ff8d2c3107a 100644 --- a/mysql-test/suite/rpl/t/rpl_found_rows.test +++ b/mysql-test/suite/rpl/t/rpl_found_rows.test @@ -247,7 +247,7 @@ sync_slave_with_master; SELECT * FROM logtbl WHERE sect = 2 ORDER BY sect,test; connection master; -DROP TABLE t1, logtbl; +DROP TABLE t1, t2, logtbl; DROP PROCEDURE just_log; DROP PROCEDURE log_me; DROP PROCEDURE log_me_inner; diff --git a/mysql-test/suite/rpl/t/rpl_slave_status.test b/mysql-test/suite/rpl/t/rpl_slave_status.test index 0b1644ab8a0..10da6733c39 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_status.test +++ b/mysql-test/suite/rpl/t/rpl_slave_status.test @@ -36,15 +36,16 @@ connection slave; # 4. Restart slave without privileges # (slave.err will contain access denied error for this START SLAVE command) stop slave; +source include/wait_for_slave_to_stop.inc; start slave; +source include/wait_for_slave_sql_to_start.inc; # 5. Make sure Slave_IO_Running = No --replace_result $MASTER_MYPORT MASTER_MYPORT # Column 1 is replaced, since the output can be either # "Connecting to master" or "Waiting for master update" --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 35 # 36 # ---vertical_results -show slave status; +query_vertical show slave status; # Cleanup (Note that slave IO thread is not running) connection slave; |