mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
replication fix
sql/log_event.cc: do not complain if the expected error was on the ignore list but we did not get it
This commit is contained in:
@ -1608,7 +1608,8 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli)
|
|||||||
mysql_parse(thd, thd->query, q_len);
|
mysql_parse(thd, thd->query, q_len);
|
||||||
if (expected_error !=
|
if (expected_error !=
|
||||||
(actual_error = thd->net.last_errno) && expected_error &&
|
(actual_error = thd->net.last_errno) && expected_error &&
|
||||||
!ignored_error_code(actual_error))
|
!ignored_error_code(actual_error) &&
|
||||||
|
!ignored_error_code(expected_error))
|
||||||
{
|
{
|
||||||
const char* errmsg = "Slave: did not get the expected error\
|
const char* errmsg = "Slave: did not get the expected error\
|
||||||
running query from master - expected: '%s' (%d), got '%s' (%d)";
|
running query from master - expected: '%s' (%d), got '%s' (%d)";
|
||||||
|
Reference in New Issue
Block a user