diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2011-09-06 21:09:35 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2011-09-06 21:09:35 +0530 |
| commit | b91308e93820f0bf4c69670b0049652dd9bb6975 (patch) | |
| tree | 9d4c4a4bae2d1558cb53e2d8b67d1479889f04b4 /scripts | |
| parent | 006a6dc3ccfde6d7b1553c3d620db79233821098 (diff) | |
| parent | 079d3cc6a6d19c2baf98c703ba28af47b45b0f4f (diff) | |
| download | mariadb-git-b91308e93820f0bf4c69670b0049652dd9bb6975.tar.gz | |
Local merge of patch for bug#11765888 from mysql-5.1.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index d8d511b9855..d45f5bc3e3d 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -46,10 +46,16 @@ Usage: $0 [OPTIONS] --cross-bootstrap For internal use. Used when building the MySQL system tables on a different host than the target. --datadir=path The path to the MySQL data directory. + --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. --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. + --help Display this help and exit. --ldata=path The path to the MySQL data directory. Same as --datadir. + --no-defaults Don't read default options from any option file. --rpm For internal use. This option is used by RPM files during the MySQL installation process. --skip-name-resolve Use IP addresses rather than hostnames when creating |