Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariaro…

…cks-merge
MariaDB · Sep 1, 2018 · 08d0a2a · 08d0a2a
2 parents 186eb2c + 6aa9219
commit 08d0a2a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
@@ -36,5 +36,4 @@ galera_kill_applier : race condition at the start of the test
 galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status
 pxc-421: Lock timeout exceeded
 galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure
-galera.galera_binlog_stmt_autoinc : MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc
-galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl
+galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl