diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-23 12:54:58 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-23 12:54:58 +0100 |
| commit | b027d104382e1e1a2e69847a06d849032213f1d6 (patch) | |
| tree | 597fc443436c6ee13ba71d8d2b703bb51ff429cc /mysql-test/suite/rpl/r/rpl_rotate_logs.result | |
| parent | 2c4f6e5c632f02880490191f5a8ea407f4d35ade (diff) | |
| parent | 8b3f9560200717a4f06be01e991f4c6ee4758504 (diff) | |
| download | mariadb-git-b027d104382e1e1a2e69847a06d849032213f1d6.tar.gz | |
Upmerge 11762407 (54999) with additions
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_rotate_logs.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_rotate_logs.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result index d8d28108330..ebc75ce9e6e 100644 --- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result +++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result @@ -37,6 +37,7 @@ drop table temp_table, t3; insert into t2 values(1234); set insert_id=1234; insert into t2 values(NULL); +call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .1234. for key .PRIMARY.. on query.* Error_code: 1062"); include/wait_for_slave_sql_error_and_skip.inc [errno=1062] purge master logs to 'master-bin.000002'; show master logs; |