diff options
author | unknown <msvensson@neptunus.(none)> | 2006-11-17 13:20:48 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-11-17 13:20:48 +0100 |
commit | c341ca2272a9f8481ebe3a3bf8cbd47ffab57245 (patch) | |
tree | a9a1c721f75c67c018d4a9546b46c17ab85d854f /mysql-test/mysql-test-run.pl | |
parent | 02cd4f5ada76abdbf80f6fdf46da3a7ac7efad51 (diff) | |
download | mariadb-git-c341ca2272a9f8481ebe3a3bf8cbd47ffab57245.tar.gz |
BUG#24354 option "--extern" of mysql-test-run.pl does not work anymore
mysql-test/mysql-test-run.pl:
Don't require restart if master is not started when running with --extern
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6cbf5789ed8..103481a491d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3820,10 +3820,17 @@ sub run_testcase_need_master_restart($) } elsif( ! $master->[0]->{'pid'} ) { - $do_restart= 1; - mtr_verbose("Restart master: master is not started"); + if ( $opt_extern ) + { + $do_restart= 0; + mtr_verbose("No restart: using extern master"); + } + else + { + $do_restart= 1; + mtr_verbose("Restart master: master is not started"); + } } - return $do_restart; } |