bk commit into 4.1 tree (jani:1.2113) BUG#7905

[jani]

Below is the list of changes that have just been committed into a local
4.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2113 05/03/14 16:59:09 jani@stripped +1 -0
  Updated error message to be more informative. Previous error message
  "Access denied to database mysql" was actually not just misleading, but
  also wrong.
  
  Bug#7905.

  sql/sql_parse.cc
    1.428 05/03/14 16:58:22 jani@stripped +5 -2
    Updated error message to be more informative. Previous error message
    "Access denied to database mysql" was actually not just misleading, but
    also wrong.
    
    Bug#7905.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-4.1

--- 1.427/sql/sql_parse.cc	Tue Feb 22 23:14:48 2005
+++ 1.428/sql/sql_parse.cc	Mon Mar 14 16:58:22 2005
@@ -3399,9 +3399,12 @@
 	     my_strcasecmp(&my_charset_latin1,
                            user->host.str, thd->host_or_ip)))
 	{
-	  if (check_access(thd, UPDATE_ACL, "mysql",0,1,0))
+	  if (check_access(thd, UPDATE_ACL, "mysql", 0, 1, 1))
+	  {
+	    send_error(thd, ER_PASSWORD_NOT_ALLOWED);
 	    goto error;
-	  break;			// We are allowed to do changes
+	  }
+	  break;		  // We are allowed to do global changes
 	}
       }
     }