diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-03-16 14:12:00 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-03-16 14:12:00 +0200 |
| commit | 98eb9518db1da854048b09d94244a982a1d32f9a (patch) | |
| tree | 9f00cc33b5cb43fd11da3c3d62903b4c009bffa0 /sql/wsrep_mysqld.cc | |
| parent | b0c43d0c381dba1ab859de8f643d8d91dd806009 (diff) | |
| parent | 0a534348c75cf435d2017959855de2efa798fd0b (diff) | |
| download | mariadb-git-98eb9518db1da854048b09d94244a982a1d32f9a.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
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 173e955e44b..8fd16d5a246 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2381,7 +2381,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; } |