← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/mtr_process.pl

  • Committer: Jay Pipes
  • Date: 2008-07-17 17:44:14 UTC
  • mfrom: (177 drizzle)
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080717174414-sm1e9agb2fjw2ncz
Merged in from trunk.

Made following changes:

libdrizzle/
  client.c
  * Removed DBUG symbols entirely
  * Removed mysql_debug() calls and command line options
  libdrizzle.c
  * Removed DBUG symbols
include/my_sys.h
  * Removed MY_DONT_FREE_DBUG symbol (used in my_end())
mysys/my_init.h
  * Removed MY_DONT_FREE_DBUG symbol (used in my_end())

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/mtr_process.pl
739
739
  # Shutdown time must be high as slave may be in reconnect
740
740
  mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo");
741
741
  mtr_add_arg($args, "$command");
742
 
  my $pid= mtr_spawn($::exe_mysqladmin, $args,
 
742
  my $pid= mtr_spawn($::exe_drizzleadmin, $args,
743
743
                     "", "", "", "",
744
744
                     { append_log_file => 1 });
745
745
  mtr_verbose("mtr_mysqladmin_start, pid: $pid");