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

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

Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-build
c76b98e7 · unknown · 31f9e5a7 · 6bcafc51 · c76b98e7
Commit c76b98e7 authored Mar 17, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

sql/sql_parse.cc sql/sql_parse.cc +4 -4

No files found.
--- 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) ||
+	    (strcmp(thd->user, user->user.str) ||
-	    user->host.str &&
+	     user->host.str &&
-	    my_strcasecmp(system_charset_info,
+	     my_strcasecmp(system_charset_info,
-			  user->host.str, thd->host_or_ip))
+			   user->host.str, thd->host_or_ip)))
 	{
 	  if (check_access(thd, UPDATE_ACL, "mysql", 0, 1, 0))
 	    goto error;