diff options
author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2011-09-06 21:27:32 +0530 |
---|---|---|
committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2011-09-06 21:27:32 +0530 |
commit | 87c6572dc5cbebda32ff1eafd50630297817fe6f (patch) | |
tree | 83795682057f44369ef21b311c079a62b0afac10 /scripts | |
parent | bb9b45313f858a3a8651b811c600e1d83f2ba3dc (diff) | |
parent | 5485967706a71431d9de5c3081dd36e40a420abc (diff) | |
download | mariadb-git-87c6572dc5cbebda32ff1eafd50630297817fe6f.tar.gz |
Local merge from mysql-5.1.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysql_install_db.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index d45f5bc3e3d..88b0823482f 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -48,7 +48,6 @@ Usage: $0 [OPTIONS] --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 |