diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-12 15:10:26 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-12 15:10:26 +0300 |
| commit | 0e7c10445f42af4b61d738034e63303b88bf570f (patch) | |
| tree | 620a4604b76d4dc5951c401d1c4131a79bbfcd3a /mysql-test/suite/rpl/r/rpl_known_bugs_detection.result | |
| parent | 25067ea7e15276dc2c7739015c6a8900805548db (diff) | |
| parent | ad6883c4f2df12fe054d996e3ed32669248bfb08 (diff) | |
| download | mariadb-git-0e7c10445f42af4b61d738034e63303b88bf570f.tar.gz | |
Auto-merge from mysql-trunk.
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_known_bugs_detection.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_known_bugs_detection.result | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result index 75180334c28..7f346070290 100644 --- a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result +++ b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result @@ -33,7 +33,7 @@ Replicate_Wild_Ignore_Table Last_Errno 1105 Last_Error Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10' Skip_Counter 0 -Exec_Master_Log_Pos 246 +Exec_Master_Log_Pos 247 Relay_Log_Space # Until_Condition None Until_Log_File @@ -50,6 +50,8 @@ Last_IO_Errno 0 Last_IO_Error Last_SQL_Errno 1105 Last_SQL_Error Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10' +Replicate_Ignore_Server_Ids +Master_Server_Id 1 SELECT * FROM t1; a b stop slave; @@ -120,7 +122,7 @@ FROM t2 ON DUPLICATE KEY UPDATE t1.field_3 = t2.field_c' Skip_Counter 0 -Exec_Master_Log_Pos 1278 +Exec_Master_Log_Pos 1279 Relay_Log_Space # Until_Condition None Until_Log_File @@ -141,6 +143,8 @@ SELECT t2.field_a, t2.field_b, t2.field_c FROM t2 ON DUPLICATE KEY UPDATE t1.field_3 = t2.field_c' +Replicate_Ignore_Server_Ids +Master_Server_Id 1 SELECT * FROM t1; id field_1 field_2 field_3 drop table t1, t2; |