Skip to content

Commit

Permalink
MDEV-27932: perfschema.dml_file_instances mtr failure
Browse files Browse the repository at this point in the history 
Order by results in MTR test to make it predictable.
  • Loading branch information
@grooverdan
grooverdan committed Feb 24, 2022
1 parent b91a123 commit 863c1a0
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
24 changes: 12 additions & 12 deletions mysql-test/suite/perfschema/r/dml_file_instances.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
#
Expand Down
22 changes: 11 additions & 11 deletions mysql-test/suite/perfschema/t/dml_file_instances.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 863c1a0

Please sign in to comment.