Commit babb78c8 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

replication fix

parent 2c035a59

sql/log_event.cc

+2 −1
Original line number Diff line number Diff line
@@ -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)";