database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.7 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2022-02-25 16:24:13 +02:00
parent a23414dd32 3d88f9f34c
commit 32d741b5b0
68 changed files with 1585 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/suite/perfschema/r/dml_file_instances.result
View File

@ -34,57 +34,57 @@ OPEN_COUNT Open handles on the file. A value of greater than zero means that the
###
CREATE DATABASE db_26152751;
USE db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
t_db_26152751.MYD
t_db_26152751.MYI
t_db_26152751.frm
RENAME TABLE t_db_26152751 to t_db_26152751_new;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
t_db_26152751_new.MYD
t_db_26152751_new.MYI
t_db_26152751_new.frm
RENAME TABLE t_db_26152751_new to t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
t_db_26152751.MYD
t_db_26152751.MYI
t_db_26152751.frm
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
t_db_26152751.frm
t_db_26152751.MYI
t_db_26152751.MYD
t_db_26152751.MYI
DROP TABLE t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
t_db_26152751.frm
t_db_26152751.ibd
RENAME TABLE t_db_26152751 to t_db_26152751_new;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
t_db_26152751_new.frm
t_db_26152751_new.ibd
RENAME TABLE t_db_26152751_new to t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
t_db_26152751.frm
t_db_26152751.ibd
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
t_db_26152751.frm
t_db_26152751.ibd
DROP TABLE t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
FILE_NAME
DROP DATABASE db_26152751;
#

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

@ -13,6 +13,7 @@ wait/synch/rwlock/innodb/lock_latch
wait/synch/rwlock/innodb/log_latch
wait/synch/rwlock/innodb/trx_i_s_cache_lock
wait/synch/rwlock/innodb/trx_purge_latch
wait/synch/rwlock/innodb/trx_rseg_latch
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
@ -37,6 +38,7 @@ WHERE event_name LIKE 'wait/synch/rwlock/innodb/%'
AND event_name NOT IN
('wait/synch/rwlock/innodb/btr_search_latch',
'wait/synch/rwlock/innodb/dict_operation_lock',
'wait/synch/rwlock/innodb/trx_rseg_latch',
'wait/synch/rwlock/innodb/trx_purge_latch')
ORDER BY event_name;
event_name

22
mysql-test/suite/perfschema/t/dml_file_instances.test
View File

@ -49,58 +49,58 @@ where table_schema='performance_schema' and table_name='file_instances';
CREATE DATABASE db_26152751;
USE db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
--sorted_result
--replace_regex /.*\/t_db_26152751/t_db_26152751/
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
RENAME TABLE t_db_26152751 to t_db_26152751_new;
--sorted_result
--replace_regex /.*\/t_db_26152751/t_db_26152751/
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
RENAME TABLE t_db_26152751_new to t_db_26152751;
--sorted_result
--replace_regex /.*\/t_db_26152751/t_db_26152751/
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
--replace_regex /.*\/t_db_26152751/t_db_26152751/
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
DROP TABLE t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
--replace_regex /.*\/t_db_26152751/t_db_26152751/
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
RENAME TABLE t_db_26152751 to t_db_26152751_new;
--replace_regex /.*\/t_db_26152751/t_db_26152751/
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
RENAME TABLE t_db_26152751_new to t_db_26152751;
--replace_regex /.*\/t_db_26152751/t_db_26152751/
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
--replace_regex /.*\/t_db_26152751/t_db_26152751/
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
DROP TABLE t_db_26152751;
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
DROP DATABASE db_26152751;

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

@ -49,6 +49,7 @@ WHERE event_name LIKE 'wait/synch/rwlock/innodb/%'
AND event_name NOT IN
('wait/synch/rwlock/innodb/btr_search_latch',
'wait/synch/rwlock/innodb/dict_operation_lock',
'wait/synch/rwlock/innodb/trx_rseg_latch',
'wait/synch/rwlock/innodb/trx_purge_latch')
ORDER BY event_name;