diff options
| author | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-04-24 14:08:03 +0500 |
|---|---|---|
| committer | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-04-24 14:08:03 +0500 |
| commit | 49b187034d05c99aee7bd83f313f774ad55156eb (patch) | |
| tree | f4598d76f6c5d538034a6b379671cf8a7e2fa3db /sql/sql_parse.cc | |
| parent | 45400e5ca328910742640506bfd48658e81a6fc1 (diff) | |
| parent | d13861546e8402e75e837f1e3e14dee7fc2ef032 (diff) | |
| download | mariadb-git-49b187034d05c99aee7bd83f313f774ad55156eb.tar.gz | |
Merge mysql.com:/home/ram/work/mysql-5.0-maint
into mysql.com:/home/ram/work/b27515/b27515.5.0
Diffstat (limited to 'sql/sql_parse.cc')
| -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 ac75e6ea2fa..35089bbb251 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3263,7 +3263,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))) |