Skip to content

Commit d86d122

Browse files
author
Marc Alff
committed
Bug#50596 Spurious test failures in perfschema.dml_mutex_instances
Fixed the dml_mutex_instances and dml_rwlock_instances to be more reliable. In particular, the tests may not assume a mutex or rwlock is never locked.
1 parent 4428409 commit d86d122

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

mysql-test/suite/perfschema/r/dml_mutex_instances.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
select * from performance_schema.MUTEX_INSTANCES limit 1;
22
NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID
3-
# # NULL
3+
# # #
44
select * from performance_schema.MUTEX_INSTANCES
55
where name='FOO';
66
NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID

mysql-test/suite/perfschema/r/dml_rwlock_instances.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
select * from performance_schema.RWLOCK_INSTANCES limit 1;
22
NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT
3-
# # NULL 0
3+
# # # #
44
select * from performance_schema.RWLOCK_INSTANCES
55
where name='FOO';
66
NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT

mysql-test/suite/perfschema/t/dml_mutex_instances.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
--source include/not_embedded.inc
1919
--source include/have_perfschema.inc
2020

21-
--replace_column 1 # 2 #
21+
--replace_column 1 # 2 # 3 #
2222
select * from performance_schema.MUTEX_INSTANCES limit 1;
2323

2424
select * from performance_schema.MUTEX_INSTANCES

mysql-test/suite/perfschema/t/dml_rwlock_instances.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
--source include/not_embedded.inc
1919
--source include/have_perfschema.inc
2020

21-
--replace_column 1 # 2 #
21+
--replace_column 1 # 2 # 3 # 4 #
2222
select * from performance_schema.RWLOCK_INSTANCES limit 1;
2323

2424
select * from performance_schema.RWLOCK_INSTANCES

0 commit comments

Comments
 (0)