Commit 62db48e4 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Docs/manual.texi 

    update for the fix
sql/slave.cc
    re-merged Jeremy's message changes, got the code to compile and run again
    after a mess-up in the merge
parent 00c87c1b

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -41654,6 +41654,8 @@ not yet 100 % confident in this code. 
@appendixsubsec Changes in release 3.23.34

@itemize @bullet

@item

Improved error diagnostic for slave thread exit

@item

Fixed bug in @code{ALTER TABLE ... ORDER BY}.

@item

Added option @code{max_user_connections} to @code{mysqld}.

sql/slave.cc

+4 −4
Original line number Diff line number Diff line
@@ -1197,18 +1197,18 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused))) 
  

  while (!slave_killed(thd))

  {

      thd->proc_info = "requesting binlog dump";

      thd->proc_info = "Requesting binlog dump";

      if(request_dump(mysql, &glob_mi))

	{

	  sql_print_error("Failed on request_dump()");

	  if(slave_killed(thd))

           goto err;

	    {

	      sql_print_error("Slave thread killed while requesting master \

dump");

              goto err;

	    }

	  

	  thd->proc_info = "waiting to reconnect after a failed dump request";

	  thd->proc_info = "Waiiting to reconnect after a failed dump request";

	  if(mysql->net.vio)

	    vio_close(mysql->net.vio);

	  // first time retry immediately, assuming that we can recover
@@ -1266,7 +1266,7 @@ try again, log '%s' at postion %ld", RPL_LOG_NAME, 
reconnect after a failed read");

	        goto err;

	      }

	    thd->proc_info = "reconnecting after a failed read";

	    thd->proc_info = "Reconnecting after a failed read";

	    sql_print_error("Slave: Failed reading log event, \

reconnecting to retry, log '%s' position %ld", RPL_LOG_NAME,

			    last_failed_pos = glob_mi.pos);