List:Internals« Previous MessageNext Message »
From:sasha Date:March 30 2002 8:42pm
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-03-30 13:42:01-07:00, sasha@stripped
  replication fix

  sql/log_event.cc
    1.77 02/03/30 13:42:00 sasha@stripped +2 -1
    do not complain if the expected error was on the ignore list but we did not
    get it

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-4.0

--- 1.76/sql/log_event.cc	Fri Mar 15 18:44:43 2002
+++ 1.77/sql/log_event.cc	Sat Mar 30 13:42:00 2002
@@ -1608,7 +1608,8 @@
       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)"; 
Thread
bk commit into 4.0 treesasha30 Mar