database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

BUG 46697

Browse Source 
Automerging mysql-5.1-bugteam into mysql-5.5-bugteam.
This commit is contained in:
Luis Soares
2010-12-14 17:35:40 +00:00
parent 0cdc8007de 74a54b0d29
commit f8a701e869
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/log_event.cc
View File

@ -3442,7 +3442,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,