summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay.choubey@oracle.com>2011-09-06 21:27:32 +0530
committerNirbhay Choubey <nirbhay.choubey@oracle.com>2011-09-06 21:27:32 +0530
commit1439641fefcc00531cf79f737bc51c6321d0f314 (patch)
tree83795682057f44369ef21b311c079a62b0afac10 /scripts
parentb91308e93820f0bf4c69670b0049652dd9bb6975 (diff)
parentd24953af5cbef54222c14325d75a34f598f1e25f (diff)
downloadmariadb-git-1439641fefcc00531cf79f737bc51c6321d0f314.tar.gz
Local merge from mysql-5.1.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh1
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