bk commit into 6.0 tree (kostja:1.2633)

[konstantin]

Below is the list of changes that have just been committed into a local
6.0 repository of kostja.  When kostja 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, 2008-04-20 16:25:54+04:00, kostja@bodhi.(none) +1 -0
  Fix a harmless code assert that failed in pushbuild.

  sql/slave.cc@stripped, 2008-04-20 16:25:51+04:00, kostja@bodhi.(none) +2 -1
    Fix a failing assert on rh-x86-32, rpl_ndb.rpl_ndb_log.test:
    WARNING:  'mysqld: slave.cc:1038: int get_master_version_and_clock(MYSQL*, Master_info*): Assertion `err_code != 0' failed.'
        COUNT: 1
        FILES:    slave.err
        TESTS:    rpl_ndb.rpl_ndb_log

diff -Nrup a/sql/slave.cc b/sql/slave.cc
--- a/sql/slave.cc	2008-04-14 14:10:00 +04:00
+++ b/sql/slave.cc	2008-04-20 16:25:51 +04:00
@@ -1021,7 +1021,8 @@ static int get_master_version_and_clock(
       err_msg.append(query);
       err_msg.append("' failed;");
       err_msg.append(" error: ");
-      err_msg.qs_append(mysql_errno(mysql));
+      err_code= mysql_errno(mysql);
+      err_msg.qs_append(err_code);
       err_msg.append("  '");
       err_msg.append(mysql_error(mysql));
       err_msg.append("'");