diff options
| author | monty@mashka.mysql.fi <> | 2003-02-04 21:52:14 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-02-04 21:52:14 +0200 |
| commit | 023d6dd39b9068ab8096c5ec60ab82bd10dbcee2 (patch) | |
| tree | bad5f8dd7f020cc76a4c5e0f19bd130e3fb4a735 /sql/sql_acl.cc | |
| parent | 6a32ae735541b4780a209e883430ded343115792 (diff) | |
| parent | 5ce0cd16b8b9fa05c781ac6ff4687133ed145d84 (diff) | |
| download | mariadb-git-023d6dd39b9068ab8096c5ec60ab82bd10dbcee2.tar.gz | |
Merge with 4.0.11
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 3dc370b7b63..689b14caac9 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -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; |