← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Brian Aker
  • Date: 2009-04-07 20:09:30 UTC
  • mfrom: (971.1.17 mordred)
  • Revision ID: brian@gaz-20090407200930-27jkul7lkwkjs2to
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
132
132
 
133
133
our $exe_master_mysqld;
134
134
our $exe_drizzle;
135
 
our $exe_drizzleadmin;
136
135
our $exe_drizzle_client_test;
137
136
our $exe_bug25714;
138
137
our $exe_drizzled;
1212
1211
  $exe_drizzlecheck= mtr_exe_exists("$path_client_bindir/drizzlecheck");
1213
1212
  $exe_drizzledump= mtr_exe_exists("$path_client_bindir/drizzledump");
1214
1213
  $exe_drizzleimport= mtr_exe_exists("$path_client_bindir/drizzleimport");
1215
 
  $exe_drizzleadmin= mtr_exe_exists("$path_client_bindir/drizzleadmin");
1216
1214
  $exe_drizzle=          mtr_exe_exists("$path_client_bindir/drizzle");
1217
1215
 
1218
1216
  if (!$opt_extern)
1508
1506
  $ENV{'DRIZZLE_MY_PRINT_DEFAULTS'}= mtr_native_path($exe_my_print_defaults);
1509
1507
 
1510
1508
  # ----------------------------------------------------
1511
 
  # Setup env so childs can execute mysqladmin
 
1509
  # Setup env so childs can shutdown the server
1512
1510
  # ----------------------------------------------------
1513
 
  $ENV{'MYSQLADMIN'}= mtr_native_path($exe_drizzleadmin);
 
1511
  $ENV{'DRIZZLED_SHUTDOWN'}= mtr_native_path($exe_drizzle);
1514
1512
 
1515
1513
  # ----------------------------------------------------
1516
1514
  # Setup env so childs can execute perror  
2660
2658
  {
2661
2659
    if ( $mysqld->{'pid'} )
2662
2660
    {
2663
 
      $pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
 
2661
      $pid= mtr_server_shutdown($mysqld);
2664
2662
      $admin_pids{$pid}= 1;
2665
2663
 
2666
2664
      push(@kill_pids,{
2818
2816
    {
2819
2817
      if ( $mysqld->{'pid'} )
2820
2818
      {
2821
 
        $pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
2822
 
 
2823
 
        $admin_pids{$pid}= 1;
2824
 
 
2825
 
        push(@kill_pids,{
2826
 
                         pid      => $mysqld->{'pid'},
2827
 
                         real_pid => $mysqld->{'real_pid'},
2828
 
                         pidfile  => $mysqld->{'path_pid'},
2829
 
                         sockfile => $mysqld->{'path_sock'},
2830
 
                         port     => $mysqld->{'port'},
2831
 
                         errfile   => $mysqld->{'path_myerr'},
2832
 
                        });
2833
 
 
2834
 
        $mysqld->{'pid'}= 0; # Assume we are done with it
 
2819
        $pid= mtr_server_shutdown($mysqld);
 
2820
 
 
2821
        $admin_pids{$pid}= 1;
 
2822
 
 
2823
        push(@kill_pids,{
 
2824
              pid      => $mysqld->{'pid'},
 
2825
              real_pid => $mysqld->{'real_pid'},
 
2826
              pidfile  => $mysqld->{'path_pid'},
 
2827
              sockfile => $mysqld->{'path_sock'},
 
2828
              port     => $mysqld->{'port'},
 
2829
              errfile   => $mysqld->{'path_myerr'},
 
2830
        });
 
2831
 
 
2832
        $mysqld->{'pid'}= 0; # Assume we are done with it
2835
2833
      }
2836
2834
    }
2837
2835
  }
2846
2844
    {
2847
2845
      if ( $mysqld->{'pid'} )
2848
2846
      {
2849
 
        $pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
2850
 
 
2851
 
        $admin_pids{$pid}= 1;
2852
 
 
2853
 
        push(@kill_pids,{
2854
 
                         pid      => $mysqld->{'pid'},
2855
 
                         real_pid => $mysqld->{'real_pid'},
2856
 
                         pidfile  => $mysqld->{'path_pid'},
2857
 
                         sockfile => $mysqld->{'path_sock'},
2858
 
                         port     => $mysqld->{'port'},
2859
 
                         errfile   => $mysqld->{'path_myerr'},
2860
 
                        });
2861
 
 
2862
 
 
2863
 
        $mysqld->{'pid'}= 0; # Assume we are done with it
 
2847
        $pid= mtr_server_shutdown($mysqld);
 
2848
 
 
2849
        $admin_pids{$pid}= 1;
 
2850
 
 
2851
        push(@kill_pids,{
 
2852
              pid      => $mysqld->{'pid'},
 
2853
              real_pid => $mysqld->{'real_pid'},
 
2854
              pidfile  => $mysqld->{'path_pid'},
 
2855
              sockfile => $mysqld->{'path_sock'},
 
2856
              port     => $mysqld->{'port'},
 
2857
              errfile  => $mysqld->{'path_myerr'},
 
2858
        });
 
2859
 
 
2860
        $mysqld->{'pid'}= 0; # Assume we are done with it
2864
2861
      }
2865
2862
    }
2866
2863
  }