Merge mysqldev@production.mysql.com:my/mysql-5.0-build

into mysql.com:/home/jimw/my/mysql-5.0-build

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a39ccacfe00..cc5bd90e4f2 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3633,10 +3633,10 @@ unsent_create_error:
       while ((user=user_list++))
       {
 	if (user->password.str &&
-	    strcmp(thd->user, user->user.str) ||
-	    user->host.str &&
-	    my_strcasecmp(system_charset_info,
-			  user->host.str, thd->host_or_ip))
+	    (strcmp(thd->user, user->user.str) ||
+	     user->host.str &&
+	     my_strcasecmp(system_charset_info,
+			   user->host.str, thd->host_or_ip)))
 	{
 	  if (check_access(thd, UPDATE_ACL, "mysql", 0, 1, 0))
 	    goto error;