fix occasisonal test failures: SELECT without ORDER BY

MariaDB · Oct 24, 2020 · e764d11 · e764d11
1 parent 606a281
commit e764d11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/mysql-test/suite/perfschema/r/dml_file_instances.result b/mysql-test/suite/perfschema/r/dml_file_instances.result
@@ -29,21 +29,21 @@ 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%";
 FILE_NAME
-t_db_26152751.frm
-t_db_26152751.MYI
 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%";
 FILE_NAME
-t_db_26152751_new.frm
-t_db_26152751_new.MYI
 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%";
 FILE_NAME
-t_db_26152751.frm
-t_db_26152751.MYI
 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%";
 FILE_NAME

diff --git a/mysql-test/suite/perfschema/t/dml_file_instances.test b/mysql-test/suite/perfschema/t/dml_file_instances.test
@@ -46,16 +46,19 @@ SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t
 
 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%";
 
 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%";
 
 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%";