Commit b44ae648 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.1-maint 

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
parents ddc600d2 5776283e

mysql-test/lib/mtr_cases.pl

+3 −2
Original line number Diff line number Diff line
@@ -537,6 +537,8 @@ sub collect_one_test_case($$$$$$$) { 
	$tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";

	return;

      }

      # Ndb tests run with two mysqld masters

      $tinfo->{'master_num'}= 2;

    }

    else

    {
@@ -552,7 +554,7 @@ sub collect_one_test_case($$$$$$$) { 


    if ( $tinfo->{'innodb_test'} )

    {

      # This is a test that need inndob

      # This is a test that need innodb

      if ( $::mysqld_variables{'innodb'} eq "FALSE" )

      {

	# innodb is not supported, skip it
@@ -578,7 +580,6 @@ our @tags= 
 ["include/have_debug.inc", "need_debug", 1],

 ["include/have_ndb.inc", "ndb_test", 1],

 ["include/have_ndb_extra.inc", "ndb_extra", 1],

 ["include/have_multi_ndb.inc", "master_num", 2],

 ["require_manager", "require_manager", 1],

);

sql-common/client.c

+7 −1
Original line number Diff line number Diff line
@@ -1881,11 +1881,17 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, 
    goto error;

  }

  vio_keepalive(net->vio,TRUE);

  /* Override local client variables */



  /* If user set read_timeout, let it override the default */

  if (mysql->options.read_timeout)

    net->read_timeout= mysql->options.read_timeout;

  vio_timeout(net->vio, 0, net->read_timeout);



  /* If user set write_timeout, let it override the default */

  if (mysql->options.write_timeout)

    net->write_timeout= mysql->options.write_timeout;

  vio_timeout(net->vio, 1, net->write_timeout);



  if (mysql->options.max_allowed_packet)

    net->max_packet_size= mysql->options.max_allowed_packet;

sql/mysql_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ void kill_one_thread(THD *thd, ulong id); 
bool net_request_file(NET* net, const char* fname);

char* query_table_status(THD *thd,const char *db,const char *table_name);



void net_set_write_timeout(NET *net, uint timeout);

void net_set_read_timeout(NET *net, uint timeout);



#define x_free(A)	{ my_free((gptr) (A),MYF(MY_WME | MY_FAE | MY_ALLOW_ZERO_PTR)); }

#define safeFree(x)	{ if(x) { my_free((gptr) x,MYF(0)); x = NULL; } }

sql/mysqld.cc

+2 −8
Original line number Diff line number Diff line
@@ -3601,10 +3601,9 @@ static bool read_init_file(char *file_name) 
#ifndef EMBEDDED_LIBRARY

static void create_new_thread(THD *thd)

{

  NET *net=&thd->net;

  DBUG_ENTER("create_new_thread");



  NET *net=&thd->net;				// For easy ref

  net->read_timeout = (uint) connect_timeout;

  if (protocol_version > 9)

    net->return_errno=1;
@@ -3899,12 +3898,7 @@ extern "C" pthread_handler_decl(handle_connections_sockets, 
    }

    if (sock == unix_sock)

      thd->host=(char*) my_localhost;

#ifdef __WIN__

    /* Set default wait_timeout */

    ulong wait_timeout= global_system_variables.net_wait_timeout * 1000;

    (void) setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&wait_timeout,

                    sizeof(wait_timeout));

#endif



    create_new_thread(thd);

  }

sql/net_serv.cc

+25 −2
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ net_real_write(NET *net,const char *packet,ulong len) 
    thr_alarm(&alarmed,(uint) net->write_timeout,&alarm_buff);

#else

  alarmed=0;

  vio_timeout(net->vio, 1, net->write_timeout);

  /* Write timeout is set in net_set_write_timeout */

#endif /* NO_ALARM */



  pos=(char*) packet; end=pos+len;
@@ -684,7 +684,7 @@ my_real_read(NET *net, ulong *complen) 
  if (net_blocking)

    thr_alarm(&alarmed,net->read_timeout,&alarm_buff);

#else

  vio_timeout(net->vio, 0, net->read_timeout);

  /* Read timeout is set in net_set_read_timeout */

#endif /* NO_ALARM */



    pos = net->buff + net->where_b;		/* net->packet -4 */
@@ -995,3 +995,26 @@ my_net_read(NET *net) 
  return len;

}





void net_set_read_timeout(NET *net, uint timeout)

{

  DBUG_ENTER("net_set_read_timeout");

  DBUG_PRINT("enter", ("timeout: %d", timeout));

  net->read_timeout= timeout;

#ifdef NO_ALARM

  vio_timeout(net->vio, 0, timeout);

#endif

  DBUG_VOID_RETURN;

}





void net_set_write_timeout(NET *net, uint timeout)

{

  DBUG_ENTER("net_set_write_timeout");

  DBUG_PRINT("enter", ("timeout: %d", timeout));

  net->write_timeout= timeout;

#ifdef NO_ALARM

  vio_timeout(net->vio, 1, timeout);

#endif

  DBUG_VOID_RETURN;

}