diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:12:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:15:10 +0200 |
| commit | c9717dc0190731c656cce31fa6e39a3db123e3af (patch) | |
| tree | 3db056a3f50e565294d127edb5339afb0a994749 /sql/sql_prepare.cc | |
| parent | 33721d91389759a917463a044fbd6f0b7654d629 (diff) | |
| parent | 1d411a8a440922f0538c1be254d6f4396af453a1 (diff) | |
| download | mariadb-git-c9717dc0190731c656cce31fa6e39a3db123e3af.tar.gz | |
Merge branch '10.2' into 10.3
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 f763613064c..6db7bc777cf 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -4196,7 +4196,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: @@ -4213,7 +4213,7 @@ reexecute: default: break; } - mysql_mutex_unlock(&thd->LOCK_wsrep_thd); + mysql_mutex_unlock(&thd->LOCK_thd_data); } #endif /* WITH_WSREP */ @@ -4392,7 +4392,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: @@ -4409,7 +4409,7 @@ reexecute: default: break; } - mysql_mutex_unlock(&thd->LOCK_wsrep_thd); + mysql_mutex_unlock(&thd->LOCK_thd_data); } #endif /* WITH_WSREP */ |