From: Date: December 29 2008 1:20pm
Subject: bzr commit into mysql-6.0-rpl branch (zhenxing.he:2775) Bug#40459
List-Archive: http://lists.mysql.com/commits/62407
X-Bug: 40459
Message-Id: <200812291220.mBTCKx2q016021@hezx-dev.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///media/sdb2/hezx/work/mysql/bzrwork/b41707/6.0-rpl/

 2775 He Zhenxing	2008-12-29 [merge]
      Merge patch for BUG#40459
modified:
  sql/slave.cc

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2008-12-24 10:48:24 +0000
+++ b/sql/slave.cc	2008-12-29 12:20:40 +0000
@@ -1187,6 +1187,7 @@ static int get_master_version_and_clock(
       err_msg.append(mysql_error(mysql));
       err_msg.append("'");
       mysql_free_result(mysql_store_result(mysql));
+      err_code= ER_SLAVE_FATAL_ERROR;
       goto err;
     }
     mysql_free_result(mysql_store_result(mysql));