5 Commits

Author	SHA1	Message	Date
Brave Galera Crew	36a2a185fe	Galera4	2019-01-23 15:30:00 +04:00
Jan Lindström	654b587999	MDEV-17208: Test failure on galera.MW-286 ... Test changes only.	2018-09-19 11:33:22 +03:00
Daniele Sciascia	0f0776b2ad	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)	2018-03-08 10:55:52 +01:00
Jan Lindström	c23efc7d50	Merge remote-tracking branch 'origin/10.0-galera' into 10.1	2017-08-21 13:35:00 +03:00
Daniele Sciascia	88a1592b0a	MW-286 Avoid spurious deadlock errors when wsrep_on is disabled ... If a conflict happens under wsrep_on, the THD's wsrep_conflict_state is typically set to MUST_ABORT and cleared later, when transaction is aborted. However, when wsrep_on is disabled, no check is performed to see whether wsrep_conflict_state is set. So this potentially creates spurious deadlock errors on the subsequent statement that runs with wsrep_on enabled. To avoid this problem wsrep_thd_set_conflict_state() sets the conflict state only if wsrep_on is enabled.	2016-08-21 16:17:15 -04:00