Commit 7e0869b9 authored by Magnus Svensson's avatar Magnus Svensson
Browse files

WL#4189 mtr, hang if worker fails before connected to server

parent 88a9c6f5

mysql-test/mysql-test-run.pl

+10 −10
Original line number Diff line number Diff line
@@ -612,6 +612,16 @@ sub run_worker ($) { 


  $SIG{INT}= sub { exit(1); };



  # Connect to server

  my $server = new IO::Socket::INET

    (

     PeerAddr => 'localhost',

     PeerPort => $server_port,

     Proto    => 'tcp'

    );

  mtr_error("Could not connect to server at port $server_port: $!")

    unless $server;



  # --------------------------------------------------------------------------

  # Set worker name

  # --------------------------------------------------------------------------
@@ -634,16 +644,6 @@ sub run_worker ($) { 


  environment_setup();



  # Connect to server

  my $server = new IO::Socket::INET

    (

     PeerAddr => 'localhost',

     PeerPort => $server_port,

     Proto    => 'tcp'

    );

  mtr_error("Could not connect to server at port $server_port: $!")

    unless $server;



  # Read hello from server which it will send when shared

  # resources have been setup

  my $hello= <$server>;