From 55e6f7452530e485252627ac0bcd39ed511d915a Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Sun, 8 Oct 2006 17:08:24 +0200
Subject: [PATCH] Do the check of special mysqld exe for master or slave after
 command line args have been parsed

---
 mysql-test/mysql-test-run.pl | 9 ++++++---
 1 file 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();
 
@@ -922,6 +919,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
   # --------------------------------------------------------------------------