Commit b31a1622 authored by unknown's avatar unknown

BUG#34789 - drop server/create server leaks memory !

When CREATE SERVER is issued, it allocates memory on memory root
to store cached server structure. When DROP SERVER is issued,
it doesn't release this memory, as it is impossible with the
memory root.

We use the same allocation strategy for plugins and acl. The problem
here that there was no way (except for the server restart) to force
'servers' code to release this memory.

With this fix it is possible to release unused server cache memory
by FLUSH PRIVILEGES.

No test case for this fix.


sql/sql_parse.cc:
  Reload servers table on FLUSH PRIVILEGES.
sql/sql_servers.cc:
  Instead of just marking memory blocks as unused, release memory
  used by servers cache and initialize new memory root.
  
  This is needed for FLUSH PRIVILEGES to release unused memory
  blocks.
parent ca629f86
......@@ -6486,6 +6486,8 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
result= 1;
if (grant_reload(thd))
result= 1;
if (servers_reload(thd))
result= 1;
}
if (tmp_thd)
{
......
......@@ -166,6 +166,9 @@ bool servers_init(bool dont_read_servers_table)
RETURN VALUES
FALSE Success
TRUE Error
TODO
Revert back to old list if we failed to load new one.
*/
static bool servers_load(THD *thd, TABLE_LIST *tables)
......@@ -175,10 +178,9 @@ static bool servers_load(THD *thd, TABLE_LIST *tables)
bool return_val= TRUE;
DBUG_ENTER("servers_load");
/* first, send all cached rows to sleep with the fishes, oblivion!
I expect this crappy comment replaced */
free_root(&mem, MYF(MY_MARK_BLOCKS_FREE));
my_hash_reset(&servers_cache);
free_root(&mem, MYF(0));
init_alloc_root(&mem, ACL_ALLOC_BLOCK_SIZE, 0);
init_read_record(&read_record_info,thd,table=tables[0].table,NULL,1,0);
while (!(read_record_info.read_record(&read_record_info)))
......
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