diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-12-14 16:41:41 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-12-14 16:41:41 +0000 |
| commit | 089327bff33188266c854e098f924d99878d1023 (patch) | |
| tree | d2d88d49079dd4c106c9dab0c595f10f7efe5f09 /mysql-test | |
| parent | 6e3314b078f30fa5533a0d59eca65a49377e8528 (diff) | |
| parent | 8282ddc430661b62f481b7134cfafd5cb77b97de (diff) | |
| download | mariadb-git-089327bff33188266c854e098f924d99878d1023.tar.gz | |
BUG 46697: automerged bzr bundle from bug report.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_stm_EE_err2.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result index e69952787fb..da24c4f5db1 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result +++ b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result @@ -11,6 +11,6 @@ set sql_log_bin=1; insert into t1 values(1),(2); ERROR 23000: Duplicate entry '2' for key 'a' drop table t1; -Error: "Query caused different errors on master and slave. Error on master: 'Duplicate entry '%-.192s' for key %d' (1062), Error on slave: 'no error' (0). Default database: 'test'. Query: 'insert into t1 values(1),(2)'" (expected different error codes on master and slave) +Error: "Query caused different errors on master and slave. Error on master: message format='Duplicate entry '%-.192s' for key %d' error code=1062 ; Error on slave: actual message='no error', error code=0. Default database: 'test'. Query: 'insert into t1 values(1),(2)'" (expected different error codes on master and slave) Errno: "0" (expected 0) drop table t1; |