mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

Browse source 
No conflicts
This commit is contained in:
Jon Olav Hauglid 2010-10-25 14:26:21 +02:00
commit b8a81fc6aa
11 changed files with 116 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/sql_parse.cc
View file

@ -3430,6 +3430,10 @@ end_with_restore_list:
if (check_access(thd, UPDATE_ACL, "mysql", NULL, NULL, 1, 1) &&
check_global_access(thd,CREATE_USER_ACL))
break;
/* Replicate current user as grantor */
thd->binlog_invoker();
/* Conditionally writes to binlog */
if (!(res = mysql_revoke_all(thd, lex->users_list)))
my_ok(thd);
@ -3446,6 +3450,9 @@ end_with_restore_list:
first_table ? 0 : 1, 0))
goto error;
/* Replicate current user as grantor */
thd->binlog_invoker();
if (thd->security_ctx->user) // If not replication
{
LEX_USER *user, *tmp_user;