diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-04-18 12:01:56 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-04-18 12:01:56 +0530 |
| commit | 5ca8121292df337849811458b6c6671f7e9b2080 (patch) | |
| tree | f8b4cd35955681c5b2deea916f2e0dab33ce7c59 /support-files/mysql.server.sh | |
| parent | fce9a0c46ab9a8a95345a8d661d2b047e64ad7d6 (diff) | |
| parent | 663068c6eea736a38eff9ac183326d6c7e4e239b (diff) | |
| download | mariadb-git-5ca8121292df337849811458b6c6671f7e9b2080.tar.gz | |
Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge
Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
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 50094ac6142..a1b43d99a05 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -166,8 +166,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 @@ -185,11 +184,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 @@ -402,7 +396,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` |