database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-6580 Assertion `thd' failed in my_malloc_size_cb_func upon writing status report into error log

Browse Source 
thd is NULL in the signal handler, display_table_locks() should expect that
This commit is contained in:
Sergei Golubchik
2014-09-07 20:19:12 +02:00
parent ca35033079
commit 9f0bdda8ab
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/sighup-6580.result Normal file
View File

@@ -0,0 +1,3 @@
select 'ok';
ok
ok

10
mysql-test/t/sighup-6580.test Normal file
View File

@@ -0,0 +1,10 @@
#
# MDEV-6580 Assertion `thd' failed in my_malloc_size_cb_func upon writing status report into error log
#
source include/not_windows.inc;
source include/not_embedded.inc;
let $pid=`select @@pid_file`;
exec kill -1 `cat $pid`;
select 'ok';

3
sql/sql_test.cc
View File

@@ -468,8 +468,7 @@ static void display_table_locks(void)
DYNAMIC_ARRAY saved_table_locks; DYNAMIC_ARRAY saved_table_locks;
(void) my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO), (void) my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),
tc_records() + 20, 50, tc_records() + 20, 50, MYF(0));
MYF(MY_THREAD_SPECIFIC));
mysql_mutex_lock(&THR_LOCK_lock); mysql_mutex_lock(&THR_LOCK_lock);
for (list= thr_lock_thread_list; list; list= list_rest(list)) for (list= thr_lock_thread_list; list; list= list_rest(list))
{ {