summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-15 15:59:32 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-15 15:59:32 +0300
commitd50fe4021eb22c6265d005ebcccf03a3905bbc75 (patch)
treefb772b810dcc80f3e7cb96dc5920791679d8dc07 /mysql-test
parent828191b6a0d2ea262783c7d0c217001c57fa1024 (diff)
parent112589cdeda90b20e015e495912fe7d4dd85c0d7 (diff)
downloadmariadb-git-d50fe4021eb22c6265d005ebcccf03a3905bbc75.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/galera/disabled.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 47f95db937d..115b4a39338 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -35,3 +35,4 @@ galera_var_slave_threads : MDEV-19746 Galera test failures because of wsrep_slav
galera_sst_mariabackup_encrypt_with_key : MDEV-19926 Galera SST tests fail
galera_wan : MDEV-17259: Test failure on galera.galera_wan
partition : MDEV-19958 Galera test failure on galera.partition
+query_cache: MDEV-15805 Test failure on galera.query_cache \ No newline at end of file