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

MDEV-17942 Assertion `found' failed in remove_ptr_from_dynarray after failed CREATE OR REPLACE

Browse Source 
Failed CREATE OR REPLACE for existing user removes that user
from acl_users array. Thus dependend structures (roles, check_host) must
be rebuilt.
This commit is contained in:
Vladislav Vaintroub 2019-02-20 16:23:10 +01:00
parent 43a6aa377e
commit a2f82b649d
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/create_drop_role.result
View File

@ -73,3 +73,12 @@ Note 1976 Can't drop role 'role_1'; it doesn't exist
DROP ROLE role_1; DROP ROLE role_1;
ERROR HY000: Operation DROP ROLE failed for 'role_1' ERROR HY000: Operation DROP ROLE failed for 'role_1'
DROP USER u1@localhost; DROP USER u1@localhost;
CREATE ROLE r;
GRANT SHOW DATABASES ON *.* TO r;
CREATE USER foo;
CREATE USER bar;
GRANT r TO foo;
CREATE OR REPLACE USER foo IDENTIFIED WITH non_existing_plugin;
ERROR HY000: Plugin 'non_existing_plugin' is not loaded
DROP ROLE r;
DROP USER bar;

11
mysql-test/t/create_drop_role.test
View File

@ -54,3 +54,14 @@ DROP ROLE IF EXISTS role_1;
DROP ROLE role_1; DROP ROLE role_1;
DROP USER u1@localhost; DROP USER u1@localhost;
# MDEV-17942
CREATE ROLE r;
GRANT SHOW DATABASES ON *.* TO r;
CREATE USER foo;
CREATE USER bar;
GRANT r TO foo;
--error ER_PLUGIN_IS_NOT_LOADED
CREATE OR REPLACE USER foo IDENTIFIED WITH non_existing_plugin;
DROP ROLE r;
DROP USER bar;

11
sql/sql_acl.cc
View File

@ -9439,6 +9439,7 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list, bool handle_as_role)
List_iterator <LEX_USER> user_list(list); List_iterator <LEX_USER> user_list(list);
TABLE_LIST tables[TABLES_MAX]; TABLE_LIST tables[TABLES_MAX];
bool binlog= false; bool binlog= false;
bool some_users_dropped= false;
DBUG_ENTER("mysql_create_user"); DBUG_ENTER("mysql_create_user");
DBUG_PRINT("entry", ("Handle as %s", handle_as_role ? "role" : "user")); DBUG_PRINT("entry", ("Handle as %s", handle_as_role ? "role" : "user"));
@ -9504,6 +9505,8 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list, bool handle_as_role)
result= true; result= true;
continue; continue;
} }
else
some_users_dropped= true;
// Proceed with the creation // Proceed with the creation
} }
else if (thd->lex->create_info.if_not_exists()) else if (thd->lex->create_info.if_not_exists())
@ -9573,9 +9576,17 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list, bool handle_as_role)
mysql_mutex_unlock(&acl_cache->lock); mysql_mutex_unlock(&acl_cache->lock);
if (result) if (result)
{
if (some_users_dropped && !handle_as_role)
{
/* Rebuild in-memory structs, since 'acl_users' has been modified */
rebuild_check_host();
rebuild_role_grants();
}
my_error(ER_CANNOT_USER, MYF(0), my_error(ER_CANNOT_USER, MYF(0),
(handle_as_role) ? "CREATE ROLE" : "CREATE USER", (handle_as_role) ? "CREATE ROLE" : "CREATE USER",
wrong_users.c_ptr_safe()); wrong_users.c_ptr_safe());
}
if (binlog) if (binlog)
result |= write_bin_log(thd, FALSE, thd->query(), thd->query_length()); result |= write_bin_log(thd, FALSE, thd->query(), thd->query_length());