summaryrefslogtreecommitdiff
path: root/scripts/mysql_fix_privilege_tables.sh
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-06-28 15:37:42 +0200
committerunknown <guilhem@mysql.com>2004-06-28 15:37:42 +0200
commit4937c8a93c9fd6374b0b21df21220d8972738439 (patch)
tree7fa0218acbc390a7d11b52b37feaa5e8f34b6602 /scripts/mysql_fix_privilege_tables.sh
parent514b051f636493943d5e3ab82392ded598ff91c0 (diff)
downloadmariadb-git-4937c8a93c9fd6374b0b21df21220d8972738439.tar.gz
Fix for BUG#4240 "mysql_fix_privilege_tables Does not use --password properly"
Pass password if it is NOT empty. Typo fixed. scripts/mysql_fix_privilege_tables.sh: Pass password if it is NOT empty. Typo fixed.
Diffstat (limited to 'scripts/mysql_fix_privilege_tables.sh')
-rw-r--r--scripts/mysql_fix_privilege_tables.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index 69bf2bebaa8..5c3e1c85248 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/scripts/mysql_fix_privilege_tables.sh
@@ -102,7 +102,7 @@ then
fi
cmd="$bindir/mysql -f --user=$user --host=$host"
-if test -z "$password" ; then
+if test ! -z "$password" ; then
cmd="$cmd --password=$password"
fi
if test ! -z "$port"; then
@@ -154,7 +154,7 @@ s_echo ""
if test $verbose = 1
then
s_echo "You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
- s_echo "as this just means that your tables where already up to date."
+ s_echo "as this just means that your tables are already up to date."
s_echo "This script is safe to run even if your tables are already up to date!"
s_echo ""
fi