diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 09:35:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 09:57:17 +0200 |
| commit | 34841d2305b6bbe2c0b496add905b1dd478dafbe (patch) | |
| tree | 85b31de5caf44a9024d73e41fbdbdadb29ff5526 /sql/wsrep_mysqld.cc | |
| parent | 62eaf7b657fd25bb4457049c81fb929314d6eb1d (diff) | |
| parent | a285e68018018ef3959f6381aa61347b73902997 (diff) | |
| download | mariadb-git-34841d2305b6bbe2c0b496add905b1dd478dafbe.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 2f41e939ee4..da92aa9bedb 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2492,9 +2492,7 @@ extern "C" void wsrep_thd_awake(THD *thd, my_bool signal) { if (signal) { - mysql_mutex_lock(&thd->LOCK_thd_data); thd->awake(KILL_QUERY); - mysql_mutex_unlock(&thd->LOCK_thd_data); } else { |