diff options
| author | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2018-03-08 10:55:52 +0100 |
|---|---|---|
| committer | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2018-03-08 10:55:52 +0100 |
| commit | 0f0776b2adf10f559bc5c2bbea95a4c5832a47f8 (patch) | |
| tree | f9f3f35624c8e7740bf07359a50b7f6f9fdc9471 /sql/wsrep_mysqld.cc | |
| parent | 176d603cc7f2be0f5816a28c738cdd52ff6e3008 (diff) | |
| download | mariadb-git-0f0776b2adf10f559bc5c2bbea95a4c5832a47f8.tar.gz | |
MDEV-13549 Fix and re-enable test galera.MW-286
This test failed to work properly because the fixes it came
with were not merged from upstream.
The test would fail with a spurious ER_LOCK_DEADLOCK error
for a conflict that happened earlier in the test execution,
while wsrep is disabled.
The original fix was to set THD::wsrep_conflict_state only
if wsrep is enabled (see wsrep_thd_set_conflict_state() in
sql/wsrep_mysqld.cc)
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 285bb520b87..9d4037082bc 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2336,7 +2336,7 @@ extern "C" void wsrep_thd_set_query_state( void wsrep_thd_set_conflict_state(THD *thd, enum wsrep_conflict_state state) { - thd->wsrep_conflict_state= state; + if (WSREP(thd)) thd->wsrep_conflict_state= state; } |