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 | fabbd2440896739321d1a286a3c1cc09ea115f6f (patch) | |
| tree | d2d88d49079dd4c106c9dab0c595f10f7efe5f09 /sql | |
| parent | 03ff2ca9d3adf92b9c0003dba7c1df7484d958a8 (diff) | |
| parent | b697bdf7570c263a21a3894b7d63d425ebcf68e2 (diff) | |
| download | mariadb-git-fabbd2440896739321d1a286a3c1cc09ea115f6f.tar.gz | |
BUG 46697: automerged bzr bundle from bug report.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index d0635ddac1a..b4599b8fd8c 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3337,7 +3337,8 @@ compare_errors: rli->report(ERROR_LEVEL, 0, "\ Query caused different errors on master and slave. \ -Error on master: '%s' (%d), Error on slave: '%s' (%d). \ +Error on master: message format='%s' error code=%d ; \ +Error on slave: actual message='%s', error code=%d. \ Default database: '%s'. Query: '%s'", ER_SAFE(expected_error), expected_error, |