Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-merge

08d0a2a8 · Sergei Petrunia · 186eb2c0 · 6aa9219a · 08d0a2a8
Commit 08d0a2a8 authored Sep 01, 2018 by Sergei Petrunia
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

mysql-test/suite/galera/disabled.def mysql-test/suite/galera/disabled.def +1 -2

No files found.
--- 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
\ No newline at end of file
+galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl