summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorjani@a193-229-222-105.elisa-laajakaista.fi <>2005-03-14 16:59:09 +0200
committerjani@a193-229-222-105.elisa-laajakaista.fi <>2005-03-14 16:59:09 +0200
commit9ec8d87328876cf1337d1cf7b2845c9b0ee0c9da (patch)
tree8e95a0745198f9f93971aadf0e0f5fcdba38b4c9 /sql/sql_parse.cc
parent13ec961c3a4f5eb6b61a5b955926aaba0dfa96f9 (diff)
downloadmariadb-git-9ec8d87328876cf1337d1cf7b2845c9b0ee0c9da.tar.gz
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.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 81cc3f00b50..10d6ddc3f98 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3399,9 +3399,12 @@ purposes internal to the MySQL server", MYF(0));
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
}
}
}