mirror of
https://github.com/MariaDB/server.git
synced 2025-07-23 00:55:06 +00:00
Merge branch 'mysql/5.5' into 5.5
This commit is contained in:
@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user