diff options
| author | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-04-24 11:28:18 +0500 |
|---|---|---|
| committer | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-04-24 11:28:18 +0500 |
| commit | 3935e2245943ac50e4c2099949e9cc29e9c7d94a (patch) | |
| tree | 7f3cf57181679d00d7c5072370e8659100646daf /sql | |
| parent | f4569bd50c1646f4af7f504c5ff10c924196d948 (diff) | |
| parent | d13861546e8402e75e837f1e3e14dee7fc2ef032 (diff) | |
| download | mariadb-git-3935e2245943ac50e4c2099949e9cc29e9c7d94a.tar.gz | |
Merge mysql.com:/home/ram/work/b27515/b27515.5.0
into mysql.com:/home/ram/work/b27515/b27515.5.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ec0dcb7e761..d095fc277c8 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2372,7 +2372,7 @@ end_with_restore_list: */ old_list= table[0]; new_list= table->next_local[0]; - if (check_grant(thd, ALTER_ACL, &old_list, 0, 1, 0) || + if (check_grant(thd, ALTER_ACL | DROP_ACL, &old_list, 0, 1, 0) || (!test_all_bits(table->next_local->grant.privilege, INSERT_ACL | CREATE_ACL) && check_grant(thd, INSERT_ACL | CREATE_ACL, &new_list, 0, 1, 0))) |