bk commit into 5.1 tree (rafal:1.2574)

[rsomla]

Below is the list of changes that have just been committed into a local
5.1 repository of rafal. When rafal 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-05-02 17:25:36+02:00, rafal@quant.(none) +2 -0
  Merge quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl
  into  quant.(none):/ext/mysql/bk/mysql-5.1-bug21842
  MERGE: 1.2561.1.1

  sql/log_event.cc@stripped, 2007-05-02 17:25:20+02:00, rafal@quant.(none) +0 -0
    Auto merged
    MERGE: 1.271.1.8

  sql/slave.cc@stripped, 2007-05-02 17:25:21+02:00, rafal@quant.(none) +0 -0
    Auto merged
    MERGE: 1.300.1.5

# 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:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bk/mysql-5.1-bug21842/RESYNC

--- 1.302/sql/slave.cc	2007-05-02 17:25:58 +02:00
+++ 1.303/sql/slave.cc	2007-05-02 17:25:59 +02:00
@@ -795,8 +795,10 @@
   else
   {
     mi->clock_diff_with_master= 0; /* The "most sensible" value */
-    sql_print_warning("\"SELECT UNIX_TIMESTAMP()\" failed on master, \
-do not trust column Seconds_Behind_Master of SHOW SLAVE STATUS");
+    sql_print_warning("\"SELECT UNIX_TIMESTAMP()\" failed on master, "
+                      "do not trust column Seconds_Behind_Master of SHOW "
+                      "SLAVE STATUS. Error: %s (%d)",
+                      mysql_error(mysql), mysql_errno(mysql));
   }
   if (master_res)
     mysql_free_result(master_res);
@@ -1632,6 +1634,7 @@
   switch (expected_error) {
   case ER_NET_READ_ERROR:
   case ER_NET_ERROR_ON_WRITE:
+  case ER_QUERY_INTERRUPTED:
   case ER_SERVER_SHUTDOWN:
   case ER_NEW_ABORTING_CONNECTION:
     DBUG_RETURN(1);