diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-11 10:18:04 -0400 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-11 10:18:04 -0400 |
| commit | 663068c6eea736a38eff9ac183326d6c7e4e239b (patch) | |
| tree | 54927ab8209a73403320aac67b6172508caed7d6 /support-files | |
| parent | 5c579482eb2dd33c7fea80ea1ab412977606458a (diff) | |
| parent | 6fa5e0814662d691be1a29bf88332348ec7c50c9 (diff) | |
| download | mariadb-git-663068c6eea736a38eff9ac183326d6c7e4e239b.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 67a7b508e33..5e9fd081a09 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. -# Copyright (c) 2012, 2014, SkySQL Ab. +# Copyright (c) 2006, 2016, Oracle and/or its affiliates. +# Copyright (c) 2012, 2017, MariaDB # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index a4034dec385..7a6154a1af5 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -157,8 +157,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 @@ -176,11 +175,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 @@ -381,7 +375,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` |