Commit 8d7f4438 authored by unknown's avatar unknown
Browse files

mysql-test-run.pl: 

  Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861


scripts/mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861
mysql-test/mysql-test-run.pl:
  Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
parent f3f39d2b

mysql-test/mysql-test-run.pl

+2 −2
Original line number Diff line number Diff line
@@ -987,10 +987,10 @@ sub executable_setup () { 
                                           # New CMake locations.

                                           "$glob_basedir/client/release",

                                           "$glob_basedir/client/debug");

      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-max",

                                           "$path_client_bindir/mysqld-nt",

      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-nt",

                                           "$path_client_bindir/mysqld",

                                           "$path_client_bindir/mysqld-debug",

                                           "$path_client_bindir/mysqld-max",

                                           "$glob_basedir/sql/release/mysqld",

                                           "$glob_basedir/sql/debug/mysqld");

      $path_language=      mtr_path_exists("$glob_basedir/share/english/",

scripts/mysqld_safe.sh

+2 −7
Original line number Diff line number Diff line
@@ -213,16 +213,11 @@ then 
  chown $user $mysql_unix_port_dir

fi



# Use the mysqld-max binary by default if the user doesn't specify a binary

# If the user doesn't specify a binary, we assume name "mysqld"

if test -z "$MYSQLD"

then

  if test -x $ledir/mysqld-max

  then

    MYSQLD=mysqld-max

  else

  MYSQLD=mysqld

fi

fi



if test ! -x $ledir/$MYSQLD

then