Commit 7761a278 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-5170 Assertion `(&(&acl_cache->lock)->m_mutex)->count > 0 &&...

MDEV-5170 Assertion `(&(&acl_cache->lock)->m_mutex)->count > 0 && pthread_equal(pthread_self(), (&(&acl_cache->lock)->m_mutex)->thread)' fails after restarting server with a pre-created role grants

lock acl_cache->lock mutex for the duration of acl_load
parent f6b8f6d1
create user user1@localhost;
create role r1 with admin user1@localhost;
grant all on test.* to r1;
select 1;
1
1
drop role r1;
drop user user1@localhost;
--source include/not_embedded.inc
#
# MDEV-5170 Assertion `(&(&acl_cache->lock)->m_mutex)->count > 0 && pthread_equal(pthread_self(), (&(&acl_cache->lock)->m_mutex)->thread)' fails after restarting server with a pre-created role grants
#
create user user1@localhost;
create role r1 with admin user1@localhost;
grant all on test.* to r1;
--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
wait
EOF
--shutdown_server 60
--source include/wait_until_disconnected.inc
--enable_reconnect
--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
restart
EOF
--source include/wait_until_connected_again.inc
select 1;
drop role r1;
drop user user1@localhost;
......@@ -1022,8 +1022,6 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
grant_version++; /* Privileges updated */
acl_cache->clear(1); // Clear locked hostname cache
init_sql_alloc(&mem, ACL_ALLOC_BLOCK_SIZE, 0, MYF(0));
if (init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0,
FALSE))
......@@ -1429,9 +1427,6 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
table->use_all_columns();
/* account for every role mapping */
if (!initialized)
mysql_mutex_lock(&acl_cache->lock);
(void) my_hash_init2(&acl_roles_mappings,50,system_charset_info,
0,0,0, (my_hash_get_key) acl_role_map_get_key, 0,0);
MEM_ROOT temp_root;
......@@ -1459,10 +1454,6 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
free_root(&temp_root, MYF(0));
end_read_record(&read_record_info);
if (!initialized)
mysql_mutex_unlock(&acl_cache->lock);
}
else
{
......@@ -1529,7 +1520,6 @@ my_bool acl_reload(THD *thd)
DYNAMIC_ARRAY old_acl_hosts, old_acl_users, old_acl_dbs, old_acl_proxy_users;
HASH old_acl_roles, old_acl_roles_mappings;
MEM_ROOT old_mem;
bool old_initialized;
my_bool return_val= TRUE;
DBUG_ENTER("acl_reload");
......@@ -1571,7 +1561,7 @@ my_bool acl_reload(THD *thd)
goto end;
}
if ((old_initialized=initialized))
acl_cache->clear(0);
mysql_mutex_lock(&acl_cache->lock);
old_acl_hosts= acl_hosts;
......@@ -1607,7 +1597,6 @@ my_bool acl_reload(THD *thd)
delete_dynamic(&old_acl_dbs);
my_hash_free(&old_acl_roles_mappings);
}
if (old_initialized)
mysql_mutex_unlock(&acl_cache->lock);
end:
close_mysql_tables(thd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment