1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#7011

Browse Source 
Fix for merge from 4.1
This commit is contained in:
acurtis@pcgem.rdg.cyberkinetica.com 2005-01-31 20:49:37 +00:00
parent adb91423ac
commit 941b959cb4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

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