diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 15:55:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 15:55:37 +0200 |
| commit | a69f4c783d0755b6004179cdbba01de1c6e5a77a (patch) | |
| tree | aaf3b804072daf7f76f87f63d90ac60df76376fb /scripts | |
| parent | fa10a65dc293c9222687b33379cebf240cc4bf29 (diff) | |
| parent | 61a880d02c3f8a5ada1fa63025c7e89ce39187c0 (diff) | |
| download | mariadb-git-a69f4c783d0755b6004179cdbba01de1c6e5a77a.tar.gz | |
Merge branch 'bb-10.0-serg' into 10.0
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 45ad0467163..fc375fcd765 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) { |