diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
| commit | e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff (patch) | |
| tree | c6f2f7343bf9ad5dfd40ec83d5485ec3e05d26d2 /support-files | |
| parent | b82c602db588cfa688278ef772050c004590c124 (diff) | |
| parent | 49552cf1f7adb3f3b7bb53696cc178363e4d9cb2 (diff) | |
| download | mariadb-git-e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff.tar.gz | |
Merge branch '10.0' 10.1
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 c9addecafa5..71e9b3fad3d 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 0e4538dc2cc..ed0da3ccddb 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` |