Commit f8df1290 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0-bug15591 

into  mysql.com:/home/mydev/mysql-5.1-bug15591


mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Bug#15591 - Occasional test suite abort due to port in use
  Manual merge.
parents a23e2eef 57b20336

mysql-test/mysql-test-run.sh

+3 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,7 @@ start_master() 
  	    --server-id=$id  \

          --basedir=$MY_BASEDIR \

          --port=$this_master_myport \

          --port-open-timeout=380 \

          --local-infile \

          --exit-info=256 \

          --core \
@@ -1298,6 +1299,7 @@ start_master() 
          --server-id=$id --rpl-recovery-rank=1 \

          --basedir=$MY_BASEDIR --init-rpl-role=master \

          --port=$this_master_myport \

          --port-open-timeout=380 \

          --local-infile \

          --datadir=$MASTER_MYDDIR$1 \

          --pid-file=$MASTER_MYPID$1 \
@@ -1431,6 +1433,7 @@ start_slave() 
          --datadir=$slave_datadir \

          --pid-file=$slave_pid \

          --port=$slave_port \

          --port-open-timeout=380 \

          --socket=$slave_sock \

          --character-sets-dir=$CHARSETSDIR \

          --default-character-set=$CHARACTER_SET \

sql/mysqld.cc

+32 −3
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ enum binlog_format opt_binlog_format_id= BF_UNSPECIFIED; 
static bool calling_initgroups= FALSE; /* Used in SIGSEGV handler. */

#endif

uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options;

uint mysqld_port_timeout;

uint delay_key_write_options, protocol_version;

uint lower_case_table_names;

uint tc_heuristic_recover= 0;
@@ -1445,7 +1446,12 @@ static void network_init(void) 
  struct sockaddr_un	UNIXaddr;

#endif

  int	arg=1;

  int   ret;

  uint  waited;

  uint  this_wait;

  uint  retry;

  DBUG_ENTER("network_init");

  LINT_INIT(ret);



  set_ports();
@@ -1471,8 +1477,26 @@ static void network_init(void) 
    */

    (void) setsockopt(ip_sock,SOL_SOCKET,SO_REUSEADDR,(char*)&arg,sizeof(arg));

#endif /* __WIN__ */

    if (bind(ip_sock, my_reinterpret_cast(struct sockaddr *) (&IPaddr),

	     sizeof(IPaddr)) < 0)

    /*

      Sometimes the port is not released fast enough when stopping and

      restarting the server. This happens quite often with the test suite

      on busy Linux systems. Retry to bind the address at these intervals:

      Sleep intervals: 1, 2, 4,  6,  9, 13, 17, 22, ...

      Retry at second: 1, 3, 7, 13, 22, 35, 52, 74, ...

      Limit the sequence by mysqld_port_timeout (set --port-open-timeout=#).

    */

    for (waited= 0, retry= 1; ; retry++, waited+= this_wait)

    {

      if (((ret= bind(ip_sock, my_reinterpret_cast(struct sockaddr *) (&IPaddr),

                      sizeof(IPaddr))) >= 0) ||

          (socket_errno != EADDRINUSE) ||

          (waited >= mysqld_port_timeout))

        break;

      sql_print_information("Retrying bind on TCP/IP port %u", mysqld_port);

      this_wait= retry * retry / 3 + 1;

      sleep(this_wait);

    }

    if (ret < 0)

    {

      DBUG_PRINT("error",("Got error: %d from bind",socket_errno));

      sql_perror("Can't start server: Bind on TCP/IP port");
@@ -4721,7 +4745,8 @@ enum options_mysqld 
  OPT_OLD_STYLE_USER_LIMITS,

  OPT_LOG_SLOW_ADMIN_STATEMENTS,

  OPT_TABLE_LOCK_WAIT_TIMEOUT,

  OPT_PLUGIN_DIR

  OPT_PLUGIN_DIR,

  OPT_PORT_OPEN_TIMEOUT

};
@@ -5334,6 +5359,10 @@ Disable with --skip-ndbcluster (will save memory).", 
   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"port", 'P', "Port number to use for connection.", (gptr*) &mysqld_port,

   (gptr*) &mysqld_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"port-open-timeout", OPT_PORT_OPEN_TIMEOUT,

   "Maximum time in seconds to wait for the port to become free. "

   "(Default: no wait)", (gptr*) &mysqld_port_timeout,

   (gptr*) &mysqld_port_timeout, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"relay-log", OPT_RELAY_LOG,

   "The location and name to use for relay logs.",

   (gptr*) &opt_relay_logname, (gptr*) &opt_relay_logname, 0,