Commit 72f1fc7e authored by unknown's avatar unknown

replication fix


sql/log_event.cc:
  do not complain if the expected error was on the ignore list but we did not
  get it
parent af75d391
......@@ -1608,7 +1608,8 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli)
mysql_parse(thd, thd->query, q_len);
if (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\
running query from master - expected: '%s' (%d), got '%s' (%d)";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment