diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2019-06-12 13:09:41 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-06-12 13:27:43 +0400 |
| commit | 9d886de499f54f2516be86a4f0f76ce57310cc2a (patch) | |
| tree | 5254f8e558455aac685e6e88fc7a13e0f839ec6a | |
| parent | b2f76bac035b62899207d443c48da8cd614cd05b (diff) | |
| download | mariadb-git-9d886de499f54f2516be86a4f0f76ce57310cc2a.tar.gz | |
MDEV-16467 - MariaDB crashes because of "long semaphore wait"after migrating from 10.1 to 10.3
This patch fixes 10.2 issue reported in MDEV-16467 by partial backport of
c2118a0. Specifically "Remove not needed LOCK_thread_count from
thd_get_error_context_description()".
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4cc4c949118..71bfc644441 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -9839,8 +9839,6 @@ char *thd_get_error_context_description(THD *thd, char *buffer, char header[256]; int len; - mysql_mutex_lock(&LOCK_thread_count); - len= my_snprintf(header, sizeof(header), "MySQL thread id %lu, OS thread handle 0x%lx, query id %lu", thd->thread_id, (ulong) thd->real_id, (ulong) thd->query_id); @@ -9885,7 +9883,6 @@ char *thd_get_error_context_description(THD *thd, char *buffer, } mysql_mutex_unlock(&thd->LOCK_thd_data); } - mysql_mutex_unlock(&LOCK_thread_count); if (str.c_ptr_safe() == buffer) return buffer; |