diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 11:57:38 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 11:57:38 +0800 |
| commit | 963051287538dc07c961d8baa18049f19c1977ab (patch) | |
| tree | a17e4b5853a3e4a0c4dcfcf7083591ba01362f80 /mysql-test/suite/rpl/r/rpl_bug33931.result | |
| parent | 66481aebb0300678b0882f0f60b43cb2025a3285 (diff) | |
| parent | 6ae50d8aedbded8dcdc7504d116f25bcd02535ff (diff) | |
| download | mariadb-git-963051287538dc07c961d8baa18049f19c1977ab.tar.gz | |
Manual merge 5.1-rep+2 to 5.1-rep+3
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_bug33931.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_bug33931.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_bug33931.result b/mysql-test/suite/rpl/r/rpl_bug33931.result index 85c8fb0da9c..ba3c3ebafe6 100644 --- a/mysql-test/suite/rpl/r/rpl_bug33931.result +++ b/mysql-test/suite/rpl/r/rpl_bug33931.result @@ -1,5 +1,5 @@ reset master; -call mtr.add_suppression("Failed during slave thread initialization"); +call mtr.add_suppression("Failed during slave I/O thread initialization"); stop slave; reset slave; SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init"; @@ -43,4 +43,6 @@ Last_IO_Errno 0 Last_IO_Error Last_SQL_Errno # Last_SQL_Error Failed during slave thread initialization +Replicate_Ignore_Server_Ids +Master_Server_Id 0 SET GLOBAL debug=""; |