diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-30 15:28:52 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-30 15:28:52 +0530 |
| commit | 92209ac6f69974169c543ae82da077f06f2b7c71 (patch) | |
| tree | 1713781010a286fa9a493781a3eb001af062fd62 /support-files/mysql.server.sh | |
| parent | 0e3170e30d2a4e8f1ed6fd4bbe935355f7370a34 (diff) | |
| parent | 725e47bfb524f4b1d29076c8777056bedd5f00ea (diff) | |
| download | mariadb-git-92209ac6f69974169c543ae82da077f06f2b7c71.tar.gz | |
Merge tag 'mariadb-10.0.31' into 10.0-galera
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 fc173e3993d..14f26b45dbf 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -160,8 +160,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 @@ -179,11 +178,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 @@ -395,7 +389,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` |