← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Lee Bieber
  • Date: 2010-11-23 05:05:31 UTC
  • mfrom: (1945.1.8 bug675670)
  • Revision ID: kalebral@gmail.com-20101123050531-sf6ma8he7s47yryd
Merge Monty - fix bug 675670: Drizzle falsely reporting conflicts with tmp/mysql.socket but starts normally

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
942
942
    }
943
943
  }
944
944
 
945
 
  # On QNX, /tmp/dir/master.sock and /tmp/dir//master.sock seem to be
946
 
  # considered different, so avoid the extra slash (/) in the socket
947
 
  # paths.
948
 
  my $sockdir = $opt_tmpdir;
949
 
  $sockdir =~ s|/+$||;
950
 
 
951
 
  # On some operating systems, there is a limit to the length of a
952
 
  # UNIX domain socket's path far below PATH_MAX, so try to avoid long
953
 
  # socket path names.
954
 
  $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) >= 70 );
955
 
 
956
945
  $master->[0]=
957
946
  {
958
947
   pid            => 0,
961
950
   path_myddir    => "$opt_vardir/master-data",
962
951
   path_myerr     => "$opt_vardir/log/master.err",
963
952
   path_pid       => "$opt_vardir/run/master.pid",
964
 
   path_sock      => "$sockdir/master.sock",
 
953
   path_sock      => "$opt_vardir/master.sock",
965
954
   port           =>  $opt_master_myport,
966
955
   secondary_port =>  $opt_master_myport + $secondary_port_offset,
967
956
   start_timeout  =>  400, # enough time create innodb tables
977
966
   path_myddir    => "$opt_vardir/master1-data",
978
967
   path_myerr     => "$opt_vardir/log/master1.err",
979
968
   path_pid       => "$opt_vardir/run/master1.pid",
980
 
   path_sock      => "$sockdir/master1.sock",
 
969
   path_sock      => "$opt_vardir/master1.sock",
981
970
   port           => $opt_master_myport + 1,
982
971
   secondary_port => $opt_master_myport + 1 + $secondary_port_offset,
983
972
   start_timeout  => 400, # enough time create innodb tables
993
982
   path_myddir    => "$opt_vardir/slave-data",
994
983
   path_myerr     => "$opt_vardir/log/slave.err",
995
984
   path_pid       => "$opt_vardir/run/slave.pid",
996
 
   path_sock      => "$sockdir/slave.sock",
 
985
   path_sock      => "$opt_vardir/slave.sock",
997
986
   port           => $opt_slave_myport,
998
987
   secondary_port => $opt_slave_myport + $secondary_port_offset,
999
988
   start_timeout  => 400,
1009
998
   path_myddir    => "$opt_vardir/slave1-data",
1010
999
   path_myerr     => "$opt_vardir/log/slave1.err",
1011
1000
   path_pid       => "$opt_vardir/run/slave1.pid",
1012
 
   path_sock      => "$sockdir/slave1.sock",
 
1001
   path_sock      => "$opt_vardir/slave1.sock",
1013
1002
   port           => $opt_slave_myport + 1,
1014
1003
   secondary_port => $opt_slave_myport + 1 + $secondary_port_offset,
1015
1004
   start_timeout  => 300,
1025
1014
   path_myddir    => "$opt_vardir/slave2-data",
1026
1015
   path_myerr     => "$opt_vardir/log/slave2.err",
1027
1016
   path_pid       => "$opt_vardir/run/slave2.pid",
1028
 
   path_sock      => "$sockdir/slave2.sock",
 
1017
   path_sock      => "$opt_vardir/slave2.sock",
1029
1018
   port           => $opt_slave_myport + 2,
1030
1019
   secondary_port => $opt_slave_myport + 2 + $secondary_port_offset,
1031
1020
   start_timeout  => 300,
2533
2522
  dtr_add_arg($args, "%s--datadir=%s", $prefix,
2534
2523
              $drizzled->{'path_myddir'});
2535
2524
 
 
2525
  dtr_add_arg($args, "%s--mysql-unix-socket-protocol.path=%s", $prefix,
 
2526
              $drizzled->{'path_sock'});
 
2527
 
2536
2528
  # Check if "extra_opt" contains --skip-log-bin
2537
2529
  if ( $drizzled->{'type'} eq 'master' )
2538
2530
  {