Local merge of patch for bug#11765888 from mysql-5.1.

This commit is contained in:
Nirbhay Choubey 2011-09-06 21:09:35 +05:30
commit bb9b45313f

View File

@ -46,10 +46,16 @@ Usage: $0 [OPTIONS]
--cross-bootstrap For internal use. Used when building the MySQL system --cross-bootstrap For internal use. Used when building the MySQL system
tables on a different host than the target. tables on a different host than the target.
--datadir=path The path to the MySQL data directory. --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 --force Causes mysql_install_db to run even if DNS does not
work. In that case, grant table entries that normally work. In that case, grant table entries that normally
use hostnames will use IP addresses. use hostnames will use IP addresses.
--help Display this help and exit.
--ldata=path The path to the MySQL data directory. Same as --datadir. --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 --rpm For internal use. This option is used by RPM files
during the MySQL installation process. during the MySQL installation process.
--skip-name-resolve Use IP addresses rather than hostnames when creating --skip-name-resolve Use IP addresses rather than hostnames when creating