From 7bd97ab7640ce705396a0363c51211f101a316a9 Mon Sep 17 00:00:00 2001
From: unknown <guilhem@mysql.com>
Date: Mon, 28 Jun 2004 15:37:42 +0200
Subject: [PATCH] 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.
---
 scripts/mysql_fix_privilege_tables.sh | 4 ++--
 1 file 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