summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-08-25 07:30:47 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-08-25 07:30:47 +0300
commite696e9e63f0ffb9867c24bcfb1aee0e62a233874 (patch)
treef38e4f16dba46e9185db9fb0ad4332d0404100ee /mysql-test/suite
parent2b66cd249384221e2a892f655fe84bb58ddc31bd (diff)
parent9f8871db2f0bcf27b05e6be34c262173b8026c80 (diff)
downloadmariadb-git-e696e9e63f0ffb9867c24bcfb1aee0e62a233874.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/innodb_gis/disabled.def2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb_gis/disabled.def b/mysql-test/suite/innodb_gis/disabled.def
index 8cae44a3607..bf500c1cb93 100644
--- a/mysql-test/suite/innodb_gis/disabled.def
+++ b/mysql-test/suite/innodb_gis/disabled.def
@@ -10,3 +10,5 @@
#
##############################################################################
+rtree_concurrent_srch : MDEV-15284 COUNT(*) mismatch
+rtree_recovery : MDEV-15284 COUNT(*) mismatch