database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-27 13:04:36 +03:00
Code Activity

Merge mysql.com:/home/ram/work/mysql-5.0-maint

Browse Source 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
This commit is contained in:
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2007-04-24 14:08:03 +05:00
parent 45400e5ca3 d13861546e
commit 49b187034d
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@@ -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)))