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

MDEV-17413 Crash in my_malloc_size_cb_func() during shutdown with

Browse Source 
forceful connection close.

Fix is to ensure that when close_connection() is called from shutdown
thread, current_thd is set. This that allocation callback for THD specific
memory won't assert(in debug version), or crash (in 10.1 and later)

close_connection() allocates THD specific memory e.g when it writes
the final error packet, and compression is ON for the connection.
This commit is contained in:
Vladislav Vaintroub 2018-10-09 18:06:22 +01:00
parent bd21904357
commit 00ddc8bc7c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysqld.cc
View File

@ -1699,7 +1699,14 @@ static void close_connections(void)
tmp->thread_id,
(tmp->main_security_ctx.user ?
tmp->main_security_ctx.user : ""));
/*
close_connection() might need a valid current_thd
for memory allocation tracking.
*/
THD* save_thd= current_thd;
set_current_thd(tmp);
close_connection(tmp,ER_SERVER_SHUTDOWN);
set_current_thd(save_thd);
}
#endif
DBUG_PRINT("quit",("Unlocking LOCK_thread_count"));