bk commit into 5.1 tree (tomas:1.2555) BUG#29570

[tomas]

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-06 12:39:03+02:00, tomas@stripped +1 -0
  Bug #29570 original error lost in write_event on slave
  - make sure error gets propagated to thd->net by calling print_error
  - also print the full error message

  sql/log_event.cc@stripped, 2007-07-06 12:38:59+02:00, tomas@stripped +12 -5
    Bug #29570 original error lost in write_event on slave
    - make sure error gets propagated to thd->net by calling print_error
    - also print the full error message

# 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-new-ndb

--- 1.278/sql/log_event.cc	2007-05-02 20:11:19 +02:00
+++ 1.279/sql/log_event.cc	2007-07-06 12:38:59 +02:00
@@ -6057,8 +6057,9 @@
 
       default:
 	slave_print_msg(ERROR_LEVEL, rli, thd->net.last_errno,
-                        "Error in %s event: row application failed",
-                        get_type_str());
+                        "Error in %s event: row application failed. %s",
+                        get_type_str(),
+                        thd->net.last_error ? thd->net.last_error : "");
 	thd->query_error= 1;
 	break;
       }
@@ -6079,9 +6080,10 @@
   {                     /* error has occured during the transaction */
     slave_print_msg(ERROR_LEVEL, rli, thd->net.last_errno,
                     "Error in %s event: error during transaction execution "
-                    "on table %s.%s",
+                    "on table %s.%s. %s",
                     get_type_str(), table->s->db.str, 
-                    table->s->table_name.str);
+                    table->s->table_name.str,
+                    thd->net.last_error ? thd->net.last_error : "");
 
      /*
       If one day we honour --skip-slave-errors in row-based replication, and
@@ -6997,7 +6999,12 @@
     }
     if ((keynum= table->file->get_dup_key(error)) < 0)
     {
-      /* We failed to retrieve the duplicate key */
+      table->file->print_error(error, MYF(0));
+      /*
+        We failed to retrieve the duplicate key
+        - either because the error was not "duplicate key" error
+        - or because the information which key is not available
+      */
       DBUG_RETURN(error);
     }