diff options
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 3dda22507af..0da86726bfb 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -518,25 +518,25 @@ then # BASEDIR is already overridden on command line. Do not re-set. # Use BASEDIR to discover le. - if test -x "$MY_BASEDIR_VERSION/libexec/mysqld" + if test -x "$MY_BASEDIR_VERSION/libexec/mariadbd" then ledir="$MY_BASEDIR_VERSION/libexec" - elif test -x "$MY_BASEDIR_VERSION/sbin/mysqld" + elif test -x "$MY_BASEDIR_VERSION/sbin/mariadbd" then ledir="$MY_BASEDIR_VERSION/sbin" else ledir="$MY_BASEDIR_VERSION/bin" fi -elif test -x "$MY_PWD/bin/mysqld" +elif test -x "$MY_PWD/bin/mariadbd" then MY_BASEDIR_VERSION="$MY_PWD" # Where bin, share and data are ledir="$MY_PWD/bin" # Where mysqld is # Check for the directories we would expect from a source install -elif test -x "$MY_PWD/libexec/mysqld" +elif test -x "$MY_PWD/libexec/mariadbd" then MY_BASEDIR_VERSION="$MY_PWD" # Where libexec, share and var are ledir="$MY_PWD/libexec" # Where mysqld is -elif test -x "$MY_PWD/sbin/mysqld" +elif test -x "$MY_PWD/sbin/mariadbd" then MY_BASEDIR_VERSION="$MY_PWD" # Where sbin, share and var are ledir="$MY_PWD/sbin" # Where mysqld is @@ -570,7 +570,7 @@ else fi if test -z "$MYSQL_HOME" -then +then if test -r "$DATADIR/my.cnf" then log_error "WARNING: Found $DATADIR/my.cnf @@ -659,7 +659,7 @@ then # mysqld does not add ".err" to "--log-error=foo."; it considers a # trailing "." as an extension - + if expr "$err_log" : '.*\.[^/]*$' > /dev/null then : @@ -741,10 +741,10 @@ then chmod 755 $mysql_unix_port_dir fi -# If the user doesn't specify a binary, we assume name "mysqld" +# If the user doesn't specify a binary, we assume name "mariadbd" if test -z "$MYSQLD" then - MYSQLD=mysqld + MYSQLD=mariadbd fi if test ! -x "$ledir/$MYSQLD" @@ -1050,8 +1050,8 @@ do log_notice "Number of processes running now: $numofproces" I=1 while test "$I" -le "$numofproces" - do - PROC=`ps xaww | grep "$ledir/$MYSQLD\>" | grep -v "grep" | grep "pid-file=$pid_file" | sed -n '$p'` + do + PROC=`ps xaww | grep "$ledir/$MYSQLD\>" | grep -v "grep" | grep "pid-file=$pid_file" | sed -n '$p'` for T in $PROC do |