Commit 916a028c authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 

into build.mysql.com:/users/rburnett/mysql-4.1
parents 8f405690 e0a12e89

sql-common/client.c

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static void mysql_close_free(MYSQL *mysql); 
static int wait_for_data(my_socket fd, uint timeout);

#endif





/****************************************************************************

  A modified version of connect().  my_connect() allows you to specify

  a timeout value, in seconds, that we should wait until we

sql/slave.cc

+7 −0
Original line number Diff line number Diff line
@@ -3056,6 +3056,9 @@ dump"); 
      }

	  

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

#ifdef SIGNAL_WITH_VIO_CLOSE

      thd->clear_active_vio();

#endif

      end_server(mysql);

      /*

	First time retry immediately, assuming that we can recover
@@ -3129,6 +3132,9 @@ max_allowed_packet", 
	  goto err;

	}

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

#ifdef SIGNAL_WITH_VIO_CLOSE

        thd->clear_active_vio();

#endif

	end_server(mysql);

	if (retry_count++)

	{
@@ -4383,4 +4389,5 @@ template class I_List_iterator<i_string>; 
template class I_List_iterator<i_string_pair>;

#endif





#endif /* HAVE_REPLICATION */