bk commit into 5.1 tree (kaa:1.2431)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa 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-03-16 17:33:22+03:00, kaa@stripped +1 -0
  Merge polly.local:/tmp/maint/bug23775/my50-bug23775
  into  polly.local:/tmp/maint/bug23775/my51-bug23775
  MERGE: 1.1810.2485.6

  sql/slave.cc@stripped, 2007-03-16 17:33:19+03:00, kaa@stripped +1 -2
    Manual merge.
    MERGE: 1.241.1.47

# 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:	kaa
# Host:	polly.local
# Root:	/tmp/maint/bug23775/my51-bug23775/RESYNC

--- 1.302/sql/slave.cc	2007-03-16 17:33:30 +03:00
+++ 1.303/sql/slave.cc	2007-03-16 17:33:30 +03:00
@@ -25,6 +25,7 @@
 #include <thr_alarm.h>
 #include <my_dir.h>
 #include <sql_common.h>
+#include <errmsg.h>
 
 #ifdef HAVE_REPLICATION
 
@@ -2071,7 +2072,7 @@ after reconnect");
       if (event_len == packet_error)
       {
         uint mysql_error_number= mysql_errno(mysql);
-        if (mysql_error_number == ER_NET_PACKET_TOO_LARGE)
+        if (mysql_error_number == CR_NET_PACKET_TOO_LARGE)
         {
           sql_print_error("\
 Log entry on master is longer than max_allowed_packet (%ld) on \