summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-12-08 01:16:05 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2018-12-08 01:17:39 +0100
commitb1c41e112cf14bd32af3d24242d7458e074cd505 (patch)
tree9c1116370f029dd2a5f0ae4bfc2ba1dbf40bf472 /sql/sql_acl.cc
parenta80f5fdbd175d00a4b6687922dc6b5ef6f40d024 (diff)
downloadmariadb-git-b1c41e112cf14bd32af3d24242d7458e074cd505.tar.gz
MDEV-17932 : assertion in multi RENAME USER command.
Sort acl_users inside the mysql_rename_user()'s loop, after every successful iteration. This is needed because on the next loop's iteration find_user_exact() is used, which requires correct sorting by name.
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 7f7bd447bad..f1612a7927f 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -10365,9 +10365,9 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
continue;
}
some_users_renamed= TRUE;
+ rebuild_acl_users();
}
- rebuild_acl_users();
/* Rebuild 'acl_check_hosts' since 'acl_users' has been modified */
rebuild_check_host();