diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-23 12:54:38 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-23 12:54:38 -0400 |
| commit | ecdb2b6e86d4bef2718eaec61f1edd1c11e41e1a (patch) | |
| tree | 010cc373543ab2e65c63b9e1e56a62252afa3c50 /scripts | |
| parent | 51a32ebeb3653bfed481a3ddbfe5f93aecdf4a35 (diff) | |
| parent | 12ae840375fe30da1c23647facaa0678858d6d92 (diff) | |
| download | mariadb-git-ecdb2b6e86d4bef2718eaec61f1edd1c11e41e1a.tar.gz | |
Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50
Diffstat (limited to 'scripts')
| -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 6b650aa6248..66b8c0d8e21 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 @@ -711,7 +711,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) { |