summaryrefslogtreecommitdiff
path: root/scripts/mysql_fix_privilege_tables.sh
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-11-28 18:19:01 +0100
committerunknown <serg@serg.mylan>2004-11-28 18:19:01 +0100
commitdd33501f9eb87d0004034aa01bd80a3d56934ad2 (patch)
tree304569af7cace94b402f78a4a7af73ac6e4e838a /scripts/mysql_fix_privilege_tables.sh
parent5607539c5b5dee4809e8e370527d3542387e27a4 (diff)
parent59abcd447cc373c1c3dfc0184f12642aa6d2ab70 (diff)
downloadmariadb-git-dd33501f9eb87d0004034aa01bd80a3d56934ad2.tar.gz
merged
BitKeeper/etc/logging_ok: auto-union innobase/srv/srv0srv.c: Auto merged mysql-test/t/select.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/slave.cc: Auto merged
Diffstat (limited to 'scripts/mysql_fix_privilege_tables.sh')
-rw-r--r--scripts/mysql_fix_privilege_tables.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index c9e8e0c4dfd..b84e512b69a 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/scripts/mysql_fix_privilege_tables.sh
@@ -115,7 +115,7 @@ then
password=$old_style_password
fi
-cmd="$bindir/mysql -f --user=$user --host=$host"
+cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host"
if test ! -z "$password" ; then
cmd="$cmd --password=$password"
fi