database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mysql-test-run.pl:

Browse Source 
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
This commit is contained in:
kent@mysql.com
2006-03-02 22:53:38 +01:00
parent e889e85a80
commit 550e73cc6e
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -987,10 +987,10 @@ sub executable_setup () {
# New CMake locations. # New CMake locations.
"$glob_basedir/client/release", "$glob_basedir/client/release",
"$glob_basedir/client/debug"); "$glob_basedir/client/debug");
$exe_mysqld= mtr_exe_exists ("$path_client_bindir/mysqld-max", $exe_mysqld= mtr_exe_exists ("$path_client_bindir/mysqld-nt",
"$path_client_bindir/mysqld-nt",
"$path_client_bindir/mysqld", "$path_client_bindir/mysqld",
"$path_client_bindir/mysqld-debug", "$path_client_bindir/mysqld-debug",
"$path_client_bindir/mysqld-max",
"$glob_basedir/sql/release/mysqld", "$glob_basedir/sql/release/mysqld",
"$glob_basedir/sql/debug/mysqld"); "$glob_basedir/sql/debug/mysqld");
$path_language= mtr_path_exists("$glob_basedir/share/english/", $path_language= mtr_path_exists("$glob_basedir/share/english/",

9
scripts/mysqld_safe.sh
View File

@ -213,15 +213,10 @@ then
chown $user $mysql_unix_port_dir chown $user $mysql_unix_port_dir
fi 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" if test -z "$MYSQLD"
then then
if test -x $ledir/mysqld-max MYSQLD=mysqld
then
MYSQLD=mysqld-max
else
MYSQLD=mysqld
fi
fi fi
if test ! -x $ledir/$MYSQLD if test ! -x $ledir/$MYSQLD