diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-04-24 10:27:59 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-04-24 10:27:59 +0500 |
| commit | b8850e15db3452924b9f4f30c08b665b0151efdc (patch) | |
| tree | 6d6b4b31b88b6bbeb2beb8979b2f1c56d599427f /sql/sql_parse.cc | |
| parent | 0ab74abc6395af5949d3797c6a9037f3317a0acd (diff) | |
| parent | 50e158402bf51521dce5fb69be9100cc8ccfebd7 (diff) | |
| download | mariadb-git-b8850e15db3452924b9f4f30c08b665b0151efdc.tar.gz | |
Merge mysql.com:/home/ram/work/b27515/b27515.4.1
into mysql.com:/home/ram/work/b27515/b27515.5.0
mysql-test/r/grant.result:
will be merged in a post-merge CS
mysql-test/t/grant.test:
manual merge
sql/sql_parse.cc:
manual merge
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 1b8bfd38fc4..23fef77c98f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3272,7 +3272,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))) |