summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-12-03 15:15:47 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-12-03 15:15:47 +0200
commit3872e585f3ed566c91abd131cb7000871107de64 (patch)
treee233548d816267beeef2186ddc5b74aa1c404356
parent1669c8890ca2e9092213626e5b047e58ca8b1e77 (diff)
downloadmariadb-git-3872e585f3ed566c91abd131cb7000871107de64.tar.gz
MDEV-24167: Stabilize perfschema.sxlock_func
The extension of the test perfschema.sxlock_func in commit 1669c8890ca2e9092213626e5b047e58ca8b1e77 turned out to be unstable. Let us filter out purge_sys.latch (trx_purge_latch) from the output, because it might happen that the purge tasks will not be executed during the test execution.
-rw-r--r--mysql-test/suite/perfschema/r/sxlock_func.result5
-rw-r--r--mysql-test/suite/perfschema/t/sxlock_func.test4
2 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/suite/perfschema/r/sxlock_func.result b/mysql-test/suite/perfschema/r/sxlock_func.result
index e1728481a41..f0276461fea 100644
--- a/mysql-test/suite/perfschema/r/sxlock_func.result
+++ b/mysql-test/suite/perfschema/r/sxlock_func.result
@@ -32,12 +32,13 @@ commit;
drop table t1;
SELECT DISTINCT event_name FROM performance_schema.events_waits_history_long
WHERE event_name LIKE 'wait/synch/rwlock/innodb/%'
-AND event_name!='wait/synch/rwlock/innodb/btr_search_latch'
+AND event_name NOT IN
+('wait/synch/rwlock/innodb/btr_search_latch',
+'wait/synch/rwlock/innodb/trx_purge_latch')
ORDER BY event_name;
event_name
wait/synch/rwlock/innodb/dict_operation_lock
wait/synch/rwlock/innodb/fil_space_latch
-wait/synch/rwlock/innodb/trx_purge_latch
select operation from performance_schema.events_waits_history_long
where event_name like "wait/synch/sxlock/%"
and operation = "shared_lock" limit 1;
diff --git a/mysql-test/suite/perfschema/t/sxlock_func.test b/mysql-test/suite/perfschema/t/sxlock_func.test
index 074b746520a..cdb6fd29015 100644
--- a/mysql-test/suite/perfschema/t/sxlock_func.test
+++ b/mysql-test/suite/perfschema/t/sxlock_func.test
@@ -45,7 +45,9 @@ drop table t1;
SELECT DISTINCT event_name FROM performance_schema.events_waits_history_long
WHERE event_name LIKE 'wait/synch/rwlock/innodb/%'
-AND event_name!='wait/synch/rwlock/innodb/btr_search_latch'
+AND event_name NOT IN
+('wait/synch/rwlock/innodb/btr_search_latch',
+ 'wait/synch/rwlock/innodb/trx_purge_latch')
ORDER BY event_name;
# Make sure some shared_lock operations have been executed