summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Black <daniel@linux.vnet.ibm.com>2017-12-12 15:22:22 +1100
committerSergey Vojtovich <svoj@mariadb.org>2018-01-12 12:09:06 +0400
commit5ea28015d5864bec1e44722bbc7a3d1f2371c85d (patch)
treecc4153bb59f907c395028926d531b37a6bffcb99 /scripts
parenta5285a8fb7dd903201275f88f7e6e930c24efb3c (diff)
downloadmariadb-git-5ea28015d5864bec1e44722bbc7a3d1f2371c85d.tar.gz
mysql_install_db: Use --defaults-group-suffix if specified
Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 00cf77d5780..d4cff4d436c 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -49,6 +49,9 @@ Usage: $0 [OPTIONS]
--defaults-extra-file=name
Read this file after the global files are read.
--defaults-file=name Only read default options from the given file name.
+ --defaults-group-suffix=name
+ In addition to the given groups, read also groups with
+ this suffix
--force Causes mysql_install_db to run even if DNS does not
work. In that case, grant table entries that
normally use hostnames will use IP addresses.
@@ -127,8 +130,8 @@ parse_arguments()
--verbose) verbose=1 ;; # Obsolete
--rpm) in_rpm=1 ;;
--help) usage ;;
- --no-defaults|--defaults-file=*|--defaults-extra-file=*)
- defaults="$arg" ;;
+ --no-defaults|--defaults-file=*|--defaults-extra-file=*|--defaults-group-suffix=*)
+ defaults="$defaults $arg" ;;
--cross-bootstrap|--windows)
# Used when building the MariaDB system tables on a different host than