diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
| commit | 9b1824dcd2564c803e58d02ac63b49ec68bd60d2 (patch) | |
| tree | beef3faf3e0e6b8264014a0cfb735d4a32be6cbc /sql/sql_prepare.cc | |
| parent | 92a13148e80c30422ae5460032169cbe1946fa6d (diff) | |
| parent | ff579bc814551026a3271fac274f560cef3f523f (diff) | |
| download | mariadb-git-9b1824dcd2564c803e58d02ac63b49ec68bd60d2.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index d0dbf90f093..8a95719069c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -4207,7 +4207,7 @@ reexecute: if (WSREP_ON) { - mysql_mutex_lock(&thd->LOCK_wsrep_thd); + mysql_mutex_lock(&thd->LOCK_thd_data); switch (thd->wsrep_conflict_state) { case CERT_FAILURE: @@ -4224,7 +4224,7 @@ reexecute: default: break; } - mysql_mutex_unlock(&thd->LOCK_wsrep_thd); + mysql_mutex_unlock(&thd->LOCK_thd_data); } #endif /* WITH_WSREP */ @@ -4402,7 +4402,7 @@ reexecute: if (WSREP_ON) { - mysql_mutex_lock(&thd->LOCK_wsrep_thd); + mysql_mutex_lock(&thd->LOCK_thd_data); switch (thd->wsrep_conflict_state) { case CERT_FAILURE: @@ -4419,7 +4419,7 @@ reexecute: default: break; } - mysql_mutex_unlock(&thd->LOCK_wsrep_thd); + mysql_mutex_unlock(&thd->LOCK_thd_data); } #endif /* WITH_WSREP */ |