replication fix

babb78c8 · sasha@mysql.sashanet.com · 2c035a59 · babb78c8
Commit babb78c8 authored Mar 30, 2002 by sasha@mysql.sashanet.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/log_event.cc sql/log_event.cc +2 -1

No files found.
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -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)";