List:Commits« Previous MessageNext Message »
From:guilhem Date:December 15 2005 6:17pm
Subject:bk commit into 5.1 tree (guilhem:1.1966)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem does a push these changes will
be propagated 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1966 05/12/15 19:17:23 guilhem@stripped +1 -0
  WL#1012 "row-based replication". There are two successful return points in Rows_log_event::exec_event (depending on STMT_END_F), so clear_error() should apply to both.

  sql/log_event.cc
    1.205 05/12/15 19:17:07 guilhem@stripped +11 -8
    there are two successful return points in Rows_log_event::exec_event (depending on STMT_END_F), so clear_error() should apply to both.

# 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:	guilhem
# Host:	gbichot2.local
# Root:	/home/mysql_src/mysql-5.1-wl1012-v3

--- 1.204/sql/log_event.cc	2005-12-15 15:28:38 +01:00
+++ 1.205/sql/log_event.cc	2005-12-15 19:17:07 +01:00
@@ -5411,7 +5411,18 @@
     rli->transaction_end(thd);
 
     if (error == 0)
+    {
+      /*
+        Clear any errors pushed in thd->net.last_err* if for example "no key
+        found" (as this is allowed). This is a safety measure; apparently
+        those errors (e.g. when executing a Delete_rows_log_event of a
+        non-existing row, like in rpl_row_mystery22.test,
+        thd->net.last_error = "Can't find record in 't1'" and last_errno=1032)
+        do not become visible. We still prefer to wipe them out.
+      */
+      thd->clear_error();
       error= Log_event::exec_event(rli);
+    }
     else
       slave_print_msg(ERROR_LEVEL, rli, error,
                       "Error in %s event: commit of row events failed, "
@@ -5469,14 +5480,6 @@
   }
 
   DBUG_ASSERT(error == 0);
-  /*
-    Clear any errors pushed in thd->net.last_err* if for example "no key
-    found" (as this is allowed). This is a safety measure; apparently those
-    errors (e.g. when executing a Delete_rows_log_event of a non-existing row,
-    like in rpl_row_mystery22.test,
-    thd->net.last_error = "Can't find record in 't1'" and last_errno=1032)
-    do not become visible. We still prefer to wipe them out.
-  */
   thd->clear_error();
   rli->inc_event_relay_log_pos();
   
Thread
bk commit into 5.1 tree (guilhem:1.1966)guilhem15 Dec