Commit 43286bf4 authored by kaa@polly.local's avatar kaa@polly.local
Browse files

Merge polly.local:/home/kaa/src/maint/bug24192/my50-bug24192 

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
parents 9b4c3d0d b270fa67

sql/slave.cc

+17 −13
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <my_dir.h>

#include <sql_common.h>

#include <errmsg.h>

#include <mysys_err.h>



#define MAX_SLAVE_RETRY_PAUSE 5

bool use_slave_mask = 0;
@@ -3612,20 +3613,23 @@ after reconnect"); 
      if (event_len == packet_error)

      {

        uint mysql_error_number= mysql_errno(mysql);

	if (mysql_error_number == CR_NET_PACKET_TOO_LARGE)

	{

        switch (mysql_error_number) {

        case CR_NET_PACKET_TOO_LARGE:

          sql_print_error("\

Log entry on master is longer than max_allowed_packet (%ld) on \

slave. If the entry is correct, restart the server with a higher value of \

max_allowed_packet",

                          thd->variables.max_allowed_packet);

          goto err;

	}

	if (mysql_error_number == ER_MASTER_FATAL_ERROR_READING_BINLOG)

	{

        case ER_MASTER_FATAL_ERROR_READING_BINLOG:

          sql_print_error(ER(mysql_error_number), mysql_error_number,

                          mysql_error(mysql));

          goto err;

        case EE_OUTOFMEMORY:

        case ER_OUTOFMEMORY:

          sql_print_error("\

Stopping slave I/O thread due to out-of-memory error from master");

          goto err;

        }

        mi->slave_running= MYSQL_SLAVE_RUN_NOT_CONNECT;

	thd->proc_info = "Waiting to reconnect after a failed master event read";