diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
commit | d7e7862364ae344fea5657eb5aae9db3fbb84553 (patch) | |
tree | 38f30e541f98dae9092a09cf030de8f2a336bfd1 /scripts/mysql_install_db.pl.in | |
parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
parent | fdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff) | |
download | mariadb-git-d7e7862364ae344fea5657eb5aae9db3fbb84553.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'scripts/mysql_install_db.pl.in')
-rw-r--r-- | scripts/mysql_install_db.pl.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index bfb910278b2..4d3641397d0 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -65,8 +65,8 @@ Usage: $0 [OPTIONS] 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. + 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. |