Skip to content

Commit e04b5ea

Browse files
dr-mdr-m
committed
Merge 10.5 into 10.6
2 parents 8321263 + 97ed3dd commit e04b5ea

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

‎mysql-test/suite/perfschema/r/dml_file_instances.result

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,57 +34,57 @@ OPEN_COUNT Open handles on the file. A value of greater than zero means that the
3434
###
3535
CREATE DATABASE db_26152751;
3636
USE db_26152751;
37-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
37+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
3838
FILE_NAME
3939
CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
40-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
40+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
4141
FILE_NAME
4242
t_db_26152751.MYD
4343
t_db_26152751.MYI
4444
t_db_26152751.frm
4545
RENAME TABLE t_db_26152751 to t_db_26152751_new;
46-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
46+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
4747
FILE_NAME
4848
t_db_26152751_new.MYD
4949
t_db_26152751_new.MYI
5050
t_db_26152751_new.frm
5151
RENAME TABLE t_db_26152751_new to t_db_26152751;
52-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
52+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
5353
FILE_NAME
5454
t_db_26152751.MYD
5555
t_db_26152751.MYI
5656
t_db_26152751.frm
5757
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
58-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
58+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
5959
FILE_NAME
6060
t_db_26152751.frm
61-
t_db_26152751.MYI
6261
t_db_26152751.MYD
62+
t_db_26152751.MYI
6363
DROP TABLE t_db_26152751;
64-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
64+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
6565
FILE_NAME
6666
CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
67-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
67+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
6868
FILE_NAME
6969
t_db_26152751.frm
7070
t_db_26152751.ibd
7171
RENAME TABLE t_db_26152751 to t_db_26152751_new;
72-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
72+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
7373
FILE_NAME
7474
t_db_26152751_new.frm
7575
t_db_26152751_new.ibd
7676
RENAME TABLE t_db_26152751_new to t_db_26152751;
77-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
77+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
7878
FILE_NAME
7979
t_db_26152751.frm
8080
t_db_26152751.ibd
8181
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
82-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
82+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
8383
FILE_NAME
8484
t_db_26152751.frm
8585
t_db_26152751.ibd
8686
DROP TABLE t_db_26152751;
87-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
87+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
8888
FILE_NAME
8989
DROP DATABASE db_26152751;
9090
#

‎mysql-test/suite/perfschema/t/dml_file_instances.test

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,58 +49,58 @@ where table_schema='performance_schema' and table_name='file_instances';
4949
CREATE DATABASE db_26152751;
5050
USE db_26152751;
5151

52-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
52+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
5353

5454
CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
5555

5656
--sorted_result
5757
--replace_regex /.*\/t_db_26152751/t_db_26152751/
58-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
58+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
5959

6060
RENAME TABLE t_db_26152751 to t_db_26152751_new;
6161

6262
--sorted_result
6363
--replace_regex /.*\/t_db_26152751/t_db_26152751/
64-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
64+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
6565

6666
RENAME TABLE t_db_26152751_new to t_db_26152751;
6767

6868
--sorted_result
6969
--replace_regex /.*\/t_db_26152751/t_db_26152751/
70-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
70+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
7171

7272
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
7373

7474
--replace_regex /.*\/t_db_26152751/t_db_26152751/
75-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
75+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
7676

7777
DROP TABLE t_db_26152751;
7878

79-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
79+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
8080

8181
CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
8282

8383
--replace_regex /.*\/t_db_26152751/t_db_26152751/
84-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
84+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
8585

8686
RENAME TABLE t_db_26152751 to t_db_26152751_new;
8787

8888
--replace_regex /.*\/t_db_26152751/t_db_26152751/
89-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
89+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
9090

9191
RENAME TABLE t_db_26152751_new to t_db_26152751;
9292

9393
--replace_regex /.*\/t_db_26152751/t_db_26152751/
94-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
94+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
9595

9696
ALTER TABLE t_db_26152751 ADD COLUMN b INT;
9797

9898
--replace_regex /.*\/t_db_26152751/t_db_26152751/
99-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
99+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
100100

101101
DROP TABLE t_db_26152751;
102102

103-
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
103+
SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%" ORDER BY FILE_NAME;
104104

105105
DROP DATABASE db_26152751;
106106

‎mysys/crc32/crc32c.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include <stddef.h>
2020
#include <stdint.h>
21-
#include <string>
2221
#include <my_global.h>
2322
#include <my_byteorder.h>
2423
static inline uint32_t DecodeFixed32(const char *ptr)

0 commit comments

Comments
 (0)