diff options
| -rw-r--r-- | Docs/README-wsrep | 3 | ||||
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/my.cnf | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 3 |
3 files changed, 0 insertions, 7 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 diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 20fee2b8656..e95a6ad98e3 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -10014,8 +10014,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 %lu, query id %lu", thd->thread_id, (ulong) thd->real_id, (ulong) thd->query_id); @@ -10060,7 +10058,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; |