← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Padraig O'Sullivan
  • Date: 2010-04-17 01:38:47 UTC
  • mfrom: (1237.9.238 bad-staging)
  • Revision ID: osullivan.padraig@gmail.com-20100417013847-ibjioqsfbmf5yg4g
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
1043
1043
  }
1044
1044
}
1045
1045
 
 
1046
sub gimme_a_good_port($)
 
1047
{
 
1048
  my $port_to_test= shift;
 
1049
  my $is_port_bad= 1;
 
1050
  while ($is_port_bad) {
 
1051
    my $sock = new IO::Socket::INET( PeerAddr => 'localhost',
 
1052
                                     PeerPort => $port_to_test,
 
1053
                                     Proto => 'tcp' );
 
1054
    if ($sock) {
 
1055
      close($sock);
 
1056
      $port_to_test += 1;
 
1057
      if ($port_to_test >= 32767) {
 
1058
        $port_to_test = 5001;
 
1059
      }
 
1060
 
 
1061
    } else {
 
1062
      $is_port_bad= 0;
 
1063
    }
 
1064
  }
 
1065
  return $port_to_test;
 
1066
 
 
1067
}
1046
1068
#
1047
1069
# To make it easier for different devs to work on the same host,
1048
1070
# an environment variable can be used to control all ports. A small
1072
1094
 
1073
1095
  # Up to two masters, up to three slaves
1074
1096
  # A magic value in command_line_setup depends on these equations.
1075
 
  $opt_master_myport=         $mtr_build_thread + 9000; # and 1
1076
 
  $opt_slave_myport=          $opt_master_myport + 2;  # and 3 4
1077
 
  $opt_memc_myport= $opt_master_myport + 10;
 
1097
  $opt_master_myport=         gimme_a_good_port($mtr_build_thread + 9000); # and 1
 
1098
 
 
1099
 
 
1100
  $opt_slave_myport=          gimme_a_good_port($opt_master_myport + 2);  # and 3 4
 
1101
  $opt_memc_myport= gimme_a_good_port($opt_master_myport + 10);
1078
1102
 
1079
1103
  if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 )
1080
1104
  {
1434
1458
  $ENV{'SLAVE_MYPORT1'}=      $slave->[1]->{'port'};
1435
1459
  $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
1436
1460
  $ENV{'MC_PORT'}=            $opt_memc_myport;
1437
 
  $ENV{'DRIZZLE_TCP_PORT'}=     $mysqld_variables{'port'};
 
1461
  $ENV{'DRIZZLE_TCP_PORT'}=     $mysqld_variables{'drizzle-protocol-port'};
1438
1462
 
1439
1463
  $ENV{'MTR_BUILD_THREAD'}=      $opt_mtr_build_thread;
1440
1464
 
3257
3281
  {
3258
3282
    # write init file for drizzled
3259
3283
    mtr_tofile($dbx_init_file,
3260
 
               "stop in drizzled::mysql_parse\n" .
 
3284
               "stop in __1cIdrizzledLmysql_parse6Fpn0AHSession_pkcI_v_\n" .
3261
3285
               "runargs $str\n" .
3262
3286
               "run\n" .
3263
3287
               "\n");