diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-02 11:05:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-02 11:05:29 +0200 |
| commit | ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6 (patch) | |
| tree | 5c5c70ee11cdf4414a9cc9a5eacdae881933c70a /scripts | |
| parent | 5ec40fbb2704a0bf1369836d88a5def4721809c8 (diff) | |
| parent | 09ec8e2e2246f9fb67fd41631c5669d9ae26b2e5 (diff) | |
| download | mariadb-git-ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 38f12b5bd03..0326d4fcd7d 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -68,6 +68,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. @@ -80,8 +81,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-auth-anonymous-user |