diff --git a/mysql-test/r/sighup-6580.result b/mysql-test/r/sighup-6580.result
new file mode 100644
index 00000000000..b77a7c6407f
--- /dev/null
+++ b/mysql-test/r/sighup-6580.result
@@ -0,0 +1,3 @@
+select 'ok';
+ok
+ok
diff --git a/mysql-test/t/sighup-6580.test b/mysql-test/t/sighup-6580.test
new file mode 100644
index 00000000000..c89b3d20a0a
--- /dev/null
+++ b/mysql-test/t/sighup-6580.test
@@ -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';
+
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index ae16a281277..c54a7f302e9 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -468,8 +468,7 @@ static void display_table_locks(void)
   DYNAMIC_ARRAY saved_table_locks;
 
   (void) my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),
-                               tc_records() + 20, 50,
-                               MYF(MY_THREAD_SPECIFIC));
+                               tc_records() + 20, 50, MYF(0));
   mysql_mutex_lock(&THR_LOCK_lock);
   for (list= thr_lock_thread_list; list; list= list_rest(list))
   {