diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:01:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:01:55 +0200 |
| commit | 3361aee591b1eb8c676f60887ffc535cd509890a (patch) | |
| tree | 54a65f83ba7d9293e6f8e8281ad920fbae6eb823 /scripts/mysqld_multi.sh | |
| parent | 6ce20fb2b9fe57330c797694b9dbea4028f40d7c (diff) | |
| parent | 0fdb17e6c3f50ae22eb97b6363bcbd8b0cd9e040 (diff) | |
| download | mariadb-git-3361aee591b1eb8c676f60887ffc535cd509890a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'scripts/mysqld_multi.sh')
| -rw-r--r-- | scripts/mysqld_multi.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 02a7acde19e..a0bc06e5e58 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -17,7 +17,7 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, # MA 02110-1301, USA -# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -631,7 +631,11 @@ sub my_which my ($command) = @_; my (@paths, $path); - return $command if (-f $command && -x $command); + # If the argument is not 'my_print_defaults' then it would be of the format + # <absolute_path>/<program> + return $command if ($command ne 'my_print_defaults' && -f $command && + -x $command); + @paths = split(':', $ENV{'PATH'}); foreach $path (@paths) { |