From: Date: July 5 2007 12:04pm
Subject: bk commit into 5.1 tree (tomas:1.2578) BUG#29570
List-Archive: http://lists.mysql.com/commits/30357
X-Bug: 29570
Message-Id: <20070705100402.5E37118134A03@linux.local>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-07-05 12:03:57+02:00, tomas@stripped +1 -0
  Bug #29570 original error lost in write_event on slave
  - quick fix for CGE 6.1

  sql/log_event.cc@stripped, 2007-07-05 12:03:54+02:00, tomas@stripped +1 -1
    Bug #29570 original error lost in write_event on slave
    - quick fix for CGE 6.1

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.1

--- 1.264/sql/log_event.cc	2007-03-22 13:10:35 +01:00
+++ 1.265/sql/log_event.cc	2007-07-05 12:03:54 +02:00
@@ -6703,7 +6703,7 @@
     if ((keynum= table->file->get_dup_key(error)) < 0)
     {
       /* We failed to retrieve the duplicate key */
-      DBUG_RETURN(HA_ERR_FOUND_DUPP_KEY);
+      DBUG_RETURN(error);
     }
 
     /*