diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-21 13:48:59 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-29 10:00:05 +0300 |
| commit | 30337addfc34c882fc6772aa3d820e0ffb52e3b9 (patch) | |
| tree | f32bb143600cb86988f034c388e4ada82ee83f6d /sql | |
| parent | 2ddea602ce18054ad5b6130a692b509506d2bde7 (diff) | |
| download | mariadb-git-30337addfc34c882fc6772aa3d820e0ffb52e3b9.tar.gz | |
MDEV-25114: Crash: WSREP: invalid state ROLLED_BACK (FATAL)
Revert "MDEV-23328 Server hang due to Galera lock conflict resolution"
This reverts commit 29bbcac0ee841faaa68eeb09c86ff825eabbe6b6.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index bbd0f3bf515..cf80bfb6249 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -835,11 +835,9 @@ static my_bool kill_handlerton(THD *thd, plugin_ref plugin, { handlerton *hton= plugin_hton(plugin); - mysql_mutex_lock(&thd->LOCK_thd_data); if (hton->state == SHOW_OPTION_YES && hton->kill_query && thd_get_ha_data(thd, hton)) hton->kill_query(hton, thd, *(enum thd_kill_levels *) level); - mysql_mutex_unlock(&thd->LOCK_thd_data); return FALSE; } diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index ce798a918e3..9f152d2a20c 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2747,7 +2747,9 @@ extern "C" void wsrep_thd_awake(THD *thd, my_bool signal) { if (signal) { - thd->awake_no_mutex(KILL_QUERY); + mysql_mutex_lock(&thd->LOCK_thd_data); + thd->awake(KILL_QUERY); + mysql_mutex_unlock(&thd->LOCK_thd_data); } else { |