summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2018-09-01 18:43:05 +0300
committerSergei Petrunia <psergey@askmonty.org>2018-09-01 18:43:05 +0300
commit08d0a2a8cf42c26f6e03952197aa46c738b7d852 (patch)
treecad0689adffd80a14a80e02d83c8b2ecdf43e21e
parent186eb2c0e0fb3d0a55d8cb3b5a1fd846600dbb0d (diff)
parent6aa9219ae4ad4c689a1ab2f3bc3d9b9da73134a8 (diff)
downloadmariadb-git-08d0a2a8cf42c26f6e03952197aa46c738b7d852.tar.gz
Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-mergebb-10.2-mariarocks-merge
-rw-r--r--mysql-test/suite/galera/disabled.def3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 41f402559aa..9be8e73f06b 100644
--- 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