diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2011-09-06 21:52:03 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2011-09-06 21:52:03 +0530 |
| commit | cdbdec94c382a3f41942905afb799ea5725fda15 (patch) | |
| tree | cc968662af128d90b9199d1c7adb99bbdcb52403 /scripts | |
| parent | 87c6572dc5cbebda32ff1eafd50630297817fe6f (diff) | |
| parent | c6b1828886f09bae99db9f8b00b792cf6b754136 (diff) | |
| download | mariadb-git-cdbdec94c382a3f41942905afb799ea5725fda15.tar.gz | |
Local merge from mysql-5.1.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.pl.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 18bd713c041..7bc1e97e7be 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -61,10 +61,15 @@ 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 |