mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 00:04:33 +01:00
Bug#7011
Fix for merge from 4.1
This commit is contained in:
parent
60f628f264
commit
dd385f2493
1 changed files with 4 additions and 4 deletions
|
@ -6001,15 +6001,15 @@ static bool check_multi_update_lock(THD *thd)
|
||||||
Ensure that we have UPDATE or SELECT privilege for each table
|
Ensure that we have UPDATE or SELECT privilege for each table
|
||||||
The exact privilege is checked in mysql_multi_update()
|
The exact privilege is checked in mysql_multi_update()
|
||||||
*/
|
*/
|
||||||
for (table= tables ; table ; table= table->next)
|
for (table= tables ; table ; table= table->next_local)
|
||||||
{
|
{
|
||||||
TABLE_LIST *save= table->next;
|
TABLE_LIST *save= table->next_local;
|
||||||
table->next= 0;
|
table->next_local= 0;
|
||||||
if ((check_access(thd, UPDATE_ACL, table->db, &table->grant.privilege,0,1) ||
|
if ((check_access(thd, UPDATE_ACL, table->db, &table->grant.privilege,0,1) ||
|
||||||
(grant_option && check_grant(thd, UPDATE_ACL, table,0,1,1))) &&
|
(grant_option && check_grant(thd, UPDATE_ACL, table,0,1,1))) &&
|
||||||
check_one_table_access(thd, SELECT_ACL, table))
|
check_one_table_access(thd, SELECT_ACL, table))
|
||||||
goto error;
|
goto error;
|
||||||
table->next= save;
|
table->next_local= save;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mysql_multi_update_prepare(thd))
|
if (mysql_multi_update_prepare(thd))
|
||||||
|
|
Loading…
Add table
Reference in a new issue