diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 13:24:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 13:24:52 +0200 |
| commit | c91ecf9e9bebf3cf2dafbd3193de4df94be09870 (patch) | |
| tree | a9ab429c8e8a6a50c38557cbdd38d9612480f49c /support-files/mysql.server.sh | |
| parent | 2645bda5f20ab10bc26dc1cb69f91b5505c1faae (diff) | |
| parent | c92168fcd26aad35bd4cb5d65175e3545133f201 (diff) | |
| download | mariadb-git-c91ecf9e9bebf3cf2dafbd3193de4df94be09870.tar.gz | |
Merge branch '10.1' into 10.2
Revert commit db0917f68f, because the fix for MDEV-12696
is coming from 5.5 and 10.1 in this merge.
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` |