From 9d886de499f54f2516be86a4f0f76ce57310cc2a Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Wed, 12 Jun 2019 13:09:41 +0400 Subject: 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()". --- sql/sql_show.cc | 3 --- 1 file changed, 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; -- cgit v1.2.1 From efc3cb9322df26e957f55dcd42f679251e273c68 Mon Sep 17 00:00:00 2001 From: sjaakola Date: Wed, 12 Jun 2019 12:50:19 +0300 Subject: MDEV-19563 Removed references to deprecated option innodb_locks_unsafe_for_binlog innodb_locks_unsafe_for_binlog variabe removed from wsrep_info test configuration and recommendation to use this variable in README-wsrep was removed as well Also relates to issue: MDEV-19544 --- Docs/README-wsrep | 3 --- plugin/wsrep_info/mysql-test/wsrep_info/my.cnf | 1 - 2 files changed, 4 deletions(-) diff --git a/Docs/README-wsrep b/Docs/README-wsrep index 2058e1eb14d..542567e7592 100644 --- a/Docs/README-wsrep +++ b/Docs/README-wsrep @@ -269,9 +269,6 @@ innodb_autoinc_lock_mode=2 autoinc lock modes 0 and 1 can cause unresolved deadlock, and make the system unresponsive. -innodb_locks_unsafe_for_binlog=1 - This option is required for parallel applying. - 5.2 WSREP OPTIONS All options are optional except for wsrep_provider, wsrep_cluster_address, and diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf index 70682178ca1..52c7789e9f7 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf +++ b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf @@ -5,7 +5,6 @@ wsrep-on=1 binlog-format=row innodb-autoinc-lock-mode=2 -innodb-locks-unsafe-for-binlog=1 wsrep-cluster-address=gcomm:// wsrep_provider=@ENV.WSREP_PROVIDER -- cgit v1.2.1