diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-11 18:02:10 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-11 18:02:10 +0200 |
| commit | ca8498e89d21baa5717fcf9f0bb5ad93a9b6bbf8 (patch) | |
| tree | 58c436966f788115f569a0ceeaba993ea07aaef3 /sql/sql_acl.cc | |
| parent | 8a0a97f02226bc8e83d5c2a5ad351a919c4b5ab4 (diff) | |
| download | mariadb-git-ca8498e89d21baa5717fcf9f0bb5ad93a9b6bbf8.tar.gz | |
Fix for a bug in SHOW GRANTS when :
grant on database.* to xx@yy with grant option;
is done.
sql/item.cc:
fix for update of non-null column with function returning NULL
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 0d434c38e3a..a9bb22fb8f7 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2894,6 +2894,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; |