summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-10 13:29:10 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-10 13:29:10 +0200
commit8cd6cee87633f66a3114b50e80528cc53221038e (patch)
tree39454f9657b38d29d1d39adc278f34c94a9bd38e
parent7a52b6fd25e69e3f74731c6ef38531c612d6ca60 (diff)
parent1c40cb6877c35cceebe59384998df58264997d39 (diff)
downloadmariadb-git-8cd6cee87633f66a3114b50e80528cc53221038e.tar.gz
Merge 10.1 into 10.2
-rw-r--r--mysql-test/disabled.def2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/disabled.def b/mysql-test/disabled.def
index 93fff886791..8ba5b271c2b 100644
--- a/mysql-test/disabled.def
+++ b/mysql-test/disabled.def
@@ -14,8 +14,6 @@ events_time_zone : Test is not predictable as it depends on precise timi
read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists
mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
#show_explain : Psergey: random timeout in range-checked-for-each record query.
-innodb-wl5522-debug-zip : broken upstream
-innodb_bug12902967 : broken upstream
file_contents : MDEV-6526 these files are not installed anymore
max_statement_time : cannot possibly work, depends on timing
partition_open_files_limit : open_files_limit check broken by MDEV-18360