summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-08-04 17:24:15 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-08-04 17:24:15 +0200
commit48b5777ebda9bf14c60ad05298dac67933e9799f (patch)
tree2c023b5cc7811faea8a9b4ad82998e4624c29068 /scripts
parentbbd70fcc43cc889e4593594ee5ca436fe1433aac (diff)
parent9a156e1a23046ba3e37bdb1e4e1ad887d3f5829b (diff)
downloadmariadb-git-48b5777ebda9bf14c60ad05298dac67933e9799f.tar.gz
Merge branch '10.4' into 10.5
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 62d0b3a58c7..5f183afe8fc 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -67,6 +67,7 @@ Usage: $0 [OPTIONS]
--cross-bootstrap For internal use. Used when building the MariaDB system
tables on a different host than the target.
--datadir=path The path to the MariaDB data directory.
+ --no-defaults Don't read default options from any option file.
--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.
@@ -79,8 +80,6 @@ Usage: $0 [OPTIONS]
--help Display this help and exit.
--ldata=path The path to the MariaDB data directory. Same as
--datadir.
- --no-defaults Don't read default options from any option file.
- --defaults-file=path Read only this configuration file.
--rpm For internal use. This option is used by RPM files
during the MariaDB installation process.
--skip-name-resolve Use IP addresses rather than hostnames when creating