← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysql-test/lib/mtr_process.pl

  • Committer: Monty Taylor
  • Date: 2008-07-01 14:33:36 UTC
  • mto: (28.1.12 backport_patch)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: monty@inaugust.com-20080701143336-8uihm7dhpu92rt0q
Somehow missed moving password.c. Duh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/lib/mtr_process.pl
734
734
  {
735
735
    mtr_add_arg($args, "--port=%s", $srv->{'port'});
736
736
  }
 
737
  if ( $srv->{'port'} and ! -e $srv->{'path_sock'} )
 
738
  {
 
739
    mtr_add_arg($args, "--protocol=tcp"); # Needed if no --socket
 
740
  }
737
741
  mtr_add_arg($args, "--connect_timeout=5");
738
742
 
739
743
  # Shutdown time must be high as slave may be in reconnect
740
744
  mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo");
741
745
  mtr_add_arg($args, "$command");
742
 
  my $pid= mtr_spawn($::exe_drizzleadmin, $args,
 
746
  my $pid= mtr_spawn($::exe_mysqladmin, $args,
743
747
                     "", "", "", "",
744
748
                     { append_log_file => 1 });
745
749
  mtr_verbose("mtr_mysqladmin_start, pid: $pid");