summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-10-13 10:56:57 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-10-13 10:56:57 +0300
commit5197d81cdb59c3d5881cec9fbc607218ff1bde4f (patch)
tree376fc075b124b5016b53f693356969386bf0f18e /mysql-test/suite/perfschema
parent55e07d9ade51e9e969f528d903509806142f4d1e (diff)
parent618d82064618bda06bcd080af5b664b3d173dbe3 (diff)
downloadmariadb-git-5197d81cdb59c3d5881cec9fbc607218ff1bde4f.tar.gz
Merge 10.8 into 10.9
Diffstat (limited to 'mysql-test/suite/perfschema')
-rw-r--r--mysql-test/suite/perfschema/t/short_option_1.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test
index 825066830f3..d18f14337a9 100644
--- a/mysql-test/suite/perfschema/t/short_option_1.test
+++ b/mysql-test/suite/perfschema/t/short_option_1.test
@@ -1,3 +1,6 @@
+# Work around MDEV-29508
+--source include/not_valgrind.inc
+
# Tests for PERFORMANCE_SCHEMA
# Check server start for short server start options