Commit ddf7e2a5 authored by unknown's avatar unknown
Browse files

Do the check of special mysqld exe for master or slave after command line args have been parsed

parent 127e4011

mysql-test/mysql-test-run.pl

+6 −3
Original line number Diff line number Diff line
@@ -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

  # --------------------------------------------------------------------------