diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-14 13:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-14 13:55:28 +0200 |
| commit | ae29ea2d86cd3fe5b2016baf595744cfb44c52cd (patch) | |
| tree | 6f5017d7d25380d567084842e35015f52724e8d1 /scripts/mysqld_multi.sh | |
| parent | 1b50d599606244677215fbe7b05be1a891fecf18 (diff) | |
| parent | ef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe (diff) | |
| download | mariadb-git-ae29ea2d86cd3fe5b2016baf595744cfb44c52cd.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
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 2f67ff424b9..7ac269b5c4b 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 @@ -621,7 +621,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) { |