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 /mysql-test | |
| 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 'mysql-test')
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/MW-286.test | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index d82d5dd2023..d61da97355d 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -48,7 +48,6 @@ galera_toi_ddl_nonconflicting : MDEV-13549 Galera test failures galera_parallel_simple : MDEV-13549 Galera test failures galera_admin : MDEV-13549 Galera test failures galera_var_max_ws_rows : MDEV-13549 Galera test failures 10.1 -MW-286 : MDEV-13549 Galera test failures 10.1 galera_as_master: MDEV-13549 Galera test failures 10.1 galera_pc_ignore_sb : MDEV-13549 Galera test failures 10.1 galera_lock_table : MDEV-13549 Galera test failures 10.1 diff --git a/mysql-test/suite/galera/t/MW-286.test b/mysql-test/suite/galera/t/MW-286.test index 08deb317fbe..1b2e322f078 100644 --- a/mysql-test/suite/galera/t/MW-286.test +++ b/mysql-test/suite/galera/t/MW-286.test @@ -25,7 +25,6 @@ SET wsrep_on = FALSE; --error ER_QUERY_INTERRUPTED ALTER TABLE t1 ADD PRIMARY KEY (f1); -SET SESSION wsrep_sync_wait = 0; SET wsrep_on = TRUE; SET GLOBAL wsrep_desync = FALSE; |