diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-26 19:32:28 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-26 19:32:28 +0400 |
| commit | 9bc32256427373e5bfa78f17c5854ac4e6a2fc31 (patch) | |
| tree | 748fd55866bcbc4de5eee1c078ac8d2cad5b6fd7 /support-files/mysql.server.sh | |
| parent | 77b2f55f61a4e3ba642049a01651c92bfb0a7d9d (diff) | |
| parent | ca7cf69cb13285585922722063af888b957580ee (diff) | |
| download | mariadb-git-9bc32256427373e5bfa78f17c5854ac4e6a2fc31.tar.gz | |
Merge tag 'mariadb-10.2.6' into bb-10.2-ext
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 9162cf7d716..1ebf2922279 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -156,8 +156,7 @@ parse_server_arguments() { # Get arguments from the my.cnf file, # the only group, which is read from now on is [mysqld] -if test -x $bindir/my_print_defaults -then +if test -x "$bindir/my_print_defaults"; then print_defaults="$bindir/my_print_defaults" else # Try to find basedir in /etc/my.cnf @@ -175,11 +174,6 @@ else print_defaults="$d/bin/my_print_defaults" break fi - if test -x "$d/bin/mysql_print_defaults" - then - print_defaults="$d/bin/mysql_print_defaults" - break - fi done fi @@ -384,7 +378,7 @@ case "$mode" in fi else # Try to find appropriate mysqld process - mysqld_pid=`pidof $libexecdir/mysqld` + mysqld_pid=`pgrep $libexecdir/mysqld` # test if multiple pids exist pid_count=`echo $mysqld_pid | wc -w` |