database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2020-11-23 17:57:58 +02:00
parent c3d4e57182 dcdc8c3506
commit a62a675fd2
55 changed files with 503 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/perfschema/r/sxlock_func.result
View File

@@ -5,11 +5,7 @@ TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
select name from performance_schema.setup_instruments
where name like "wait/synch/sxlock/%"
and name not in
("wait/synch/sxlock/innodb/buf_block_lock",
"wait/synch/sxlock/innodb/buf_block_debug_latch")
order by name;
where name like "wait/synch/sxlock/%" order by name;
name
wait/synch/sxlock/innodb/btr_search_latch
wait/synch/sxlock/innodb/dict_operation_lock

2
mysql-test/suite/perfschema/t/nesting.test
View File

@@ -9,6 +9,8 @@
# event, which changes the test output.
--source include/not_windows.inc
--source include/no_protocol.inc
# Work around MDEV-24232: WSREP causes extra operations on LOCK_thd_data etc.
--source include/have_wsrep.inc
--source ../include/wait_for_pfs_thread_count.inc
--disable_query_log

7
mysql-test/suite/perfschema/t/sxlock_func.test
View File

@@ -16,13 +16,8 @@ TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
# Check some SX-locks classes are instrumented
# (exclude instruments that depend on compiling options)
select name from performance_schema.setup_instruments
where name like "wait/synch/sxlock/%"
and name not in
("wait/synch/sxlock/innodb/buf_block_lock",
"wait/synch/sxlock/innodb/buf_block_debug_latch")
order by name;
where name like "wait/synch/sxlock/%" order by name;
# Check some SX-locks instances are instrumented
select name from performance_schema.rwlock_instances