database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 4.0.11

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-02-04 21:52:14 +02:00
parent 6a32ae7355 5ce0cd16b8
commit 023d6dd39b
206 changed files with 11563 additions and 65011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_acl.cc
View File

@ -2849,8 +2849,6 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user)
VOID(pthread_mutex_lock(&acl_cache->lock));
/* Add first global access grants */
if (acl_user->access || acl_user->password ||
acl_user->ssl_type != SSL_TYPE_NONE)
{
want_access=acl_user->access;
String global(buff,sizeof(buff),&my_charset_latin1);
@ -2983,6 +2981,8 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user)
if (test_all_bits(want_access,(DB_ACLS & ~GRANT_ACL)))
db.append("ALL PRIVILEGES",14);
else if (!(want_access & ~GRANT_ACL))
db.append("USAGE",5);
else
{
int found=0, cnt;