diff options
author | Alexey Botchkov <holyfoot@askmonty.org> | 2016-06-16 13:41:45 +0400 |
---|---|---|
committer | Alexey Botchkov <holyfoot@askmonty.org> | 2016-06-16 13:41:45 +0400 |
commit | b21e7af20ed4e694376b6a2a246af9dd481d7bb0 (patch) | |
tree | 1e9d1cd48bec7fc26fe8c637a70229fd7ecae4b8 /scripts | |
parent | 0e50b924820d365bcc1659eec2cad606f6887597 (diff) | |
download | mariadb-git-b21e7af20ed4e694376b6a2a246af9dd481d7bb0.tar.gz |
MDEV-9969 mysql_install_db error processing ignore_db_dirs.
Changes to the mysql_install_db scripts so they don't repeat
arguments twice.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysql_install_db.pl.in | 2 | ||||
-rw-r--r-- | scripts/mysql_install_db.sh | 2 |
2 files changed, 2 insertions, 2 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: |