diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-24 12:01:22 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-24 12:01:22 -0400 |
| commit | 14d62505d90f01eb6d81466c1d69fa38523c4d3e (patch) | |
| tree | 98e08ad71dd605fdfbad22080be969ecae6747ce /scripts | |
| parent | 868c2ceb013e06c29ba37d4634f2d543b96539aa (diff) | |
| parent | 9fc102b37ec45bf5a1010a9f660137304de482bc (diff) | |
| download | mariadb-git-14d62505d90f01eb6d81466c1d69fa38523c4d3e.tar.gz | |
Merge tag 'mariadb-10.0.26' into 10.0-galera
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.pl.in | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 4d3641397d0..ede5fabd3aa 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -238,7 +238,7 @@ sub quote_options { ############################################################################## my $opt = {}; -parse_arguments($opt, 'PICK-ARGS-FROM-ARGV', @ARGV); +parse_arguments($opt, @ARGV); # ---------------------------------------------------------------------- # We can now find my_print_defaults. This script supports: diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index d08d04914ee..bdce0857d1e 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -216,7 +216,7 @@ cannot_find_file() # Ok, let's go. We first need to parse arguments which are required by # my_print_defaults so that we can execute it first, then later re-parse # the command line to add any extra bits that we need. -parse_arguments PICK-ARGS-FROM-ARGV "$@" +parse_arguments "$@" # # We can now find my_print_defaults. This script supports: diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 3d754ac88fb..44dbd5826d2 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) { |