diff options
| author | msvensson@shellback.(none) <> | 2006-10-08 17:08:24 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-10-08 17:08:24 +0200 |
| commit | 55e6f7452530e485252627ac0bcd39ed511d915a (patch) | |
| tree | 6c266ca838de9d89916fe5ed6fc3a1ebdabd31d6 /mysql-test | |
| parent | ca611ed679e91eacd938884f0a0c496899a4d855 (diff) | |
| download | mariadb-git-55e6f7452530e485252627ac0bcd39ed511d915a.tar.gz | |
Do the check of special mysqld exe for master or slave after command line args have been parsed
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6bb069a11f5..40b0efd4971 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -487,9 +487,6 @@ sub initial_setup () { "$glob_basedir/sql/release/mysqld", "$glob_basedir/sql/debug/mysqld"); - $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld; - $exe_slave_mysqld= $exe_slave_mysqld || $exe_mysqld; - # Use the mysqld found above to find out what features are available collect_mysqld_features(); @@ -923,6 +920,12 @@ sub command_line_setup () { } # -------------------------------------------------------------------------- + # Check if special exe was selected for master or slave + # -------------------------------------------------------------------------- + $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld; + $exe_slave_mysqld= $exe_slave_mysqld || $exe_mysqld; + + # -------------------------------------------------------------------------- # Check valgrind arguments # -------------------------------------------------------------------------- if ( $opt_valgrind or $opt_valgrind_path or defined $opt_valgrind_options) |