diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-27 18:20:54 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-27 18:20:54 -0600 |
| commit | 9c4cdff0e3ae6ff6a75b335a39d0db46a02bd593 (patch) | |
| tree | ec43625b8ae87070a064e6bbfdea98b060708b29 /mysql-test/mysql-test-run.pl | |
| parent | 760132426d4515bb41ad02c7557805bc4967b52a (diff) | |
| parent | 88516bcb4b7b8e16357c7406e99898b7f57ad81e (diff) | |
| download | mariadb-git-9c4cdff0e3ae6ff6a75b335a39d0db46a02bd593.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysql_upgrade.c:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 3830f5f3ec9..d0acce6de74 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4135,7 +4135,7 @@ sub stop_all_servers () { my $pid; # Start shutdown of all started masters - foreach my $mysqld (@{$master}, @{$slave}) + foreach my $mysqld (@{$slave}, @{$master}) { if ( $mysqld->{'pid'} ) { |