database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

perfschema compilation, test and misc fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2020-02-15 18:25:57 +01:00
parent 81cffda2e6
commit 7af733a5a2
403 changed files with 20147 additions and 63173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/suite/perfschema/r/setup_instruments_defaults.result
View File

@ -5,28 +5,14 @@ SELECT * FROM performance_schema.setup_instruments
WHERE name IN (
'wait/synch/mutex/sql/LOCK_user_conn',
'wait/synch/mutex/sql/LOCK_uuid_generator',
<<<<<<< HEAD
'wait/synch/mutex/sql/LOCK_plugin',
=======
'wait/synch/mutex/sql/LOCK_transaction_cache',
>>>>>>> merge-perfschema-5.7
'stage/sql/creating table')
AND enabled = 'yes' AND timed = 'no'
ORDER BY name;
NAME ENABLED TIMED
<<<<<<< HEAD
stage/sql/Creating table YES NO
=======
stage/sql/creating table YES NO
<<<<<<< HEAD
>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_plugin YES NO
wait/synch/mutex/sql/LOCK_user_conn YES NO
=======
wait/synch/mutex/sql/LOCK_transaction_cache YES NO
wait/synch/mutex/sql/LOCK_user_conn YES NO
wait/synch/mutex/sql/LOCK_uuid_generator YES NO
>>>>>>> merge-perfschema-5.7
SELECT * FROM performance_schema.setup_instruments
WHERE name = 'wait/synch/mutex/sql/LOCK_thd_list'
AND enabled = 'no' AND timed = 'no';
@ -38,10 +24,6 @@ WHERE name IN (
AND enabled = 'yes' AND timed = 'yes'
ORDER BY name;
NAME ENABLED TIMED
<<<<<<< HEAD
wait/synch/mutex/sql/THD::LOCK_thd_data YES YES
=======
>>>>>>> 258e16fa2de... WIP 5.7 P_S
SELECT * FROM performance_schema.setup_instruments
WHERE name = 'wait/synch/mutex/sql/hash_filo::lock'
AND enabled = 'no' AND timed = 'no'