Skip to content

Commit 615b1f4

Browse files
dr-mdr-m
committed
Merge 10.1 into 10.2
innodb.table_flags: Adjust the test case. Due to the MDEV-12873 fix in 10.2, the corrupted flags for table test.td would be converted, and a tablespace flag mismatch will occur when trying to open the file.
2 parents 72378a2 + 58f87a4 commit 615b1f4

26 files changed

+812
-149
lines changed

‎mysql-test/suite/encryption/r/innodb_lotoftables.result

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ create database innodb_encrypted_1;
1010
use innodb_encrypted_1;
1111
show status like 'innodb_pages0_read%';
1212
Variable_name Value
13-
Innodb_pages0_read 1
13+
Innodb_pages0_read 3
1414
set autocommit=0;
1515
set autocommit=1;
1616
commit work;
1717
show status like 'innodb_pages0_read%';
1818
Variable_name Value
19-
Innodb_pages0_read 1
19+
Innodb_pages0_read 3
2020
# should be 100
2121
SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE NAME LIKE 'innodb_encrypted%';
2222
COUNT(*)
@@ -86,47 +86,47 @@ Innodb_pages0_read 3
8686
# Restart Success!
8787
show status like 'innodb_pages0_read%';
8888
Variable_name Value
89-
Innodb_pages0_read 1
89+
Innodb_pages0_read 303
9090
show status like 'innodb_pages0_read%';
9191
Variable_name Value
92-
Innodb_pages0_read 1
92+
Innodb_pages0_read 303
9393
use test;
9494
show status like 'innodb_pages0_read%';
9595
Variable_name Value
96-
Innodb_pages0_read 1
96+
Innodb_pages0_read 303
9797
use innodb_encrypted_1;
9898
show status like 'innodb_pages0_read%';
9999
Variable_name Value
100-
Innodb_pages0_read 1
100+
Innodb_pages0_read 303
101101
use innodb_encrypted_2;
102102
show status like 'innodb_pages0_read%';
103103
Variable_name Value
104-
Innodb_pages0_read 1
104+
Innodb_pages0_read 303
105105
use innodb_encrypted_3;
106106
show status like 'innodb_pages0_read%';
107107
Variable_name Value
108-
Innodb_pages0_read 1
108+
Innodb_pages0_read 303
109109
use innodb_encrypted_1;
110110
show status like 'innodb_pages0_read%';
111111
Variable_name Value
112-
Innodb_pages0_read 1
112+
Innodb_pages0_read 303
113113
show status like 'innodb_pages0_read%';
114114
Variable_name Value
115-
Innodb_pages0_read 101
115+
Innodb_pages0_read 303
116116
use innodb_encrypted_2;
117117
show status like 'innodb_pages0_read%';
118118
Variable_name Value
119-
Innodb_pages0_read 101
119+
Innodb_pages0_read 303
120120
show status like 'innodb_pages0_read%';
121121
Variable_name Value
122-
Innodb_pages0_read 201
122+
Innodb_pages0_read 303
123123
use innodb_encrypted_3;
124124
show status like 'innodb_pages0_read%';
125125
Variable_name Value
126-
Innodb_pages0_read 201
126+
Innodb_pages0_read 303
127127
show status like 'innodb_pages0_read%';
128128
Variable_name Value
129-
Innodb_pages0_read 301
129+
Innodb_pages0_read 303
130130
SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%';
131131
COUNT(*)
132132
100

‎mysql-test/suite/innodb/r/table_flags,32k.rdiff

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
--- suite/innodb/r/table_flags.result
2+
+++ suite/innodb/r/table_flags,32k.reject
3+
@@ -5,6 +5,8 @@
4+
SET innodb_strict_mode=OFF;
5+
CREATE TABLE tz(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=COMPRESSED
6+
KEY_BLOCK_SIZE=1;
7+
+Warnings:
8+
+Warning 1478 InnoDB: Cannot create a COMPRESSED table when innodb_page_size > 16k. Assuming ROW_FORMAT=DYNAMIC.
9+
SET innodb_strict_mode=ON;
10+
CREATE TABLE tp(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=DYNAMIC
11+
PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9;
12+
@@ -13,7 +15,7 @@
13+
header=0x01000003016e (NAME=0x696e66696d756d00)
14+
header=0x00002815008d (NAME='SYS_DATAFILES',
15+
DB_TRX_ID=0x000000000302,
16+
- DB_ROLL_PTR=0x81000001320194,
17+
+ DB_ROLL_PTR=0x81000001310194,
18+
ID=0x000000000000000e,
19+
N_COLS=0x00000002,
20+
TYPE=0x00000001,
21+
@@ -23,7 +25,7 @@
22+
SPACE=0x00000000)
23+
header=0x0000101500d5 (NAME='SYS_FOREIGN',
24+
DB_TRX_ID=0x000000000300,
25+
- DB_ROLL_PTR=0x800000012d0110,
26+
+ DB_ROLL_PTR=0x800000012c0110,
27+
ID=0x000000000000000b,
28+
N_COLS=0x00000004,
29+
TYPE=0x00000001,
30+
@@ -33,7 +35,7 @@
31+
SPACE=0x00000000)
32+
header=0x000018150122 (NAME='SYS_FOREIGN_COLS',
33+
DB_TRX_ID=0x000000000300,
34+
- DB_ROLL_PTR=0x800000012d0201,
35+
+ DB_ROLL_PTR=0x800000012c0201,
36+
ID=0x000000000000000c,
37+
N_COLS=0x00000004,
38+
TYPE=0x00000001,
39+
@@ -43,7 +45,7 @@
40+
SPACE=0x00000000)
41+
header=0x0400201501b8 (NAME='SYS_TABLESPACES',
42+
DB_TRX_ID=0x000000000302,
43+
- DB_ROLL_PTR=0x81000001320110,
44+
+ DB_ROLL_PTR=0x81000001310110,
45+
ID=0x000000000000000d,
46+
N_COLS=0x00000003,
47+
TYPE=0x00000001,
48+
@@ -53,7 +55,7 @@
49+
SPACE=0x00000000)
50+
header=0x000030150244 (NAME='SYS_VIRTUAL',
51+
DB_TRX_ID=0x000000000304,
52+
- DB_ROLL_PTR=0x82000001350110,
53+
+ DB_ROLL_PTR=0x82000001340110,
54+
ID=0x000000000000000f,
55+
N_COLS=0x00000003,
56+
TYPE=0x00000001,
57+
@@ -63,7 +65,7 @@
58+
SPACE=0x00000000)
59+
header=0x000040150288 (NAME='test/tc',
60+
DB_TRX_ID=0x000000000308,
61+
- DB_ROLL_PTR=0x84000001380110,
62+
+ DB_ROLL_PTR=0x84000001370110,
63+
ID=0x0000000000000011,
64+
N_COLS=0x80000001,
65+
TYPE=0x00000001,
66+
@@ -73,7 +75,7 @@
67+
SPACE=0x00000002)
68+
header=0x000048150310 (NAME='test/td',
69+
DB_TRX_ID=0x00000000030a,
70+
- DB_ROLL_PTR=0x85000001390110,
71+
+ DB_ROLL_PTR=0x85000001380110,
72+
ID=0x0000000000000012,
73+
N_COLS=0x80000001,
74+
TYPE=0x00000021,
75+
@@ -83,7 +85,7 @@
76+
SPACE=0x00000003)
77+
header=0x000058150200 (NAME='test/tp',
78+
DB_TRX_ID=0x00000000030e,
79+
- DB_ROLL_PTR=0x870000013b0110,
80+
+ DB_ROLL_PTR=0x870000013a0110,
81+
ID=0x0000000000000014,
82+
N_COLS=0x80000001,
83+
TYPE=0x000009a1,
84+
@@ -93,7 +95,7 @@
85+
SPACE=0x00000005)
86+
header=0x0000381502cc (NAME='test/tr',
87+
DB_TRX_ID=0x000000000306,
88+
- DB_ROLL_PTR=0x83000001370110,
89+
+ DB_ROLL_PTR=0x83000001360110,
90+
ID=0x0000000000000010,
91+
N_COLS=0x00000001,
92+
TYPE=0x00000001,
93+
@@ -103,10 +105,10 @@
94+
SPACE=0x00000001)
95+
header=0x000050150074 (NAME='test/tz',
96+
DB_TRX_ID=0x00000000030c,
97+
- DB_ROLL_PTR=0x860000013a0110,
98+
+ DB_ROLL_PTR=0x86000001390110,
99+
ID=0x0000000000000013,
100+
N_COLS=0x80000001,
101+
- TYPE=0x00000023,
102+
+ TYPE=0x00000021,
103+
MIX_ID=0x0000000000000000,
104+
MIX_LEN=0x00000050,
105+
CLUSTER_NAME=NULL(0 bytes),

‎mysql-test/suite/innodb/r/table_flags,4k.rdiff

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
--- suite/innodb/r/table_flags.result
2+
+++ suite/innodb/r/table_flags,4k.reject
3+
@@ -13,7 +13,7 @@
4+
header=0x01000003016e (NAME=0x696e66696d756d00)
5+
header=0x00002815008d (NAME='SYS_DATAFILES',
6+
DB_TRX_ID=0x000000000302,
7+
- DB_ROLL_PTR=0x81000001320194,
8+
+ DB_ROLL_PTR=0x81000003260194,
9+
ID=0x000000000000000e,
10+
N_COLS=0x00000002,
11+
TYPE=0x00000001,
12+
@@ -23,7 +23,7 @@
13+
SPACE=0x00000000)
14+
header=0x0000101500d5 (NAME='SYS_FOREIGN',
15+
DB_TRX_ID=0x000000000300,
16+
- DB_ROLL_PTR=0x800000012d0110,
17+
+ DB_ROLL_PTR=0x80000003200110,
18+
ID=0x000000000000000b,
19+
N_COLS=0x00000004,
20+
TYPE=0x00000001,
21+
@@ -33,7 +33,7 @@
22+
SPACE=0x00000000)
23+
header=0x000018150122 (NAME='SYS_FOREIGN_COLS',
24+
DB_TRX_ID=0x000000000300,
25+
- DB_ROLL_PTR=0x800000012d0201,
26+
+ DB_ROLL_PTR=0x80000003200201,
27+
ID=0x000000000000000c,
28+
N_COLS=0x00000004,
29+
TYPE=0x00000001,
30+
@@ -43,7 +43,7 @@
31+
SPACE=0x00000000)
32+
header=0x0400201501b8 (NAME='SYS_TABLESPACES',
33+
DB_TRX_ID=0x000000000302,
34+
- DB_ROLL_PTR=0x81000001320110,
35+
+ DB_ROLL_PTR=0x81000003260110,
36+
ID=0x000000000000000d,
37+
N_COLS=0x00000003,
38+
TYPE=0x00000001,
39+
@@ -53,7 +53,7 @@
40+
SPACE=0x00000000)
41+
header=0x000030150244 (NAME='SYS_VIRTUAL',
42+
DB_TRX_ID=0x000000000304,
43+
- DB_ROLL_PTR=0x82000001350110,
44+
+ DB_ROLL_PTR=0x820000032a0110,
45+
ID=0x000000000000000f,
46+
N_COLS=0x00000003,
47+
TYPE=0x00000001,
48+
@@ -63,7 +63,7 @@
49+
SPACE=0x00000000)
50+
header=0x000040150288 (NAME='test/tc',
51+
DB_TRX_ID=0x000000000308,
52+
- DB_ROLL_PTR=0x84000001380110,
53+
+ DB_ROLL_PTR=0x840000032d0110,
54+
ID=0x0000000000000011,
55+
N_COLS=0x80000001,
56+
TYPE=0x00000001,
57+
@@ -73,7 +73,7 @@
58+
SPACE=0x00000002)
59+
header=0x000048150310 (NAME='test/td',
60+
DB_TRX_ID=0x00000000030a,
61+
- DB_ROLL_PTR=0x85000001390110,
62+
+ DB_ROLL_PTR=0x850000032f0110,
63+
ID=0x0000000000000012,
64+
N_COLS=0x80000001,
65+
TYPE=0x00000021,
66+
@@ -83,7 +83,7 @@
67+
SPACE=0x00000003)
68+
header=0x000058150200 (NAME='test/tp',
69+
DB_TRX_ID=0x00000000030e,
70+
- DB_ROLL_PTR=0x870000013b0110,
71+
+ DB_ROLL_PTR=0x87000003310110,
72+
ID=0x0000000000000014,
73+
N_COLS=0x80000001,
74+
TYPE=0x000009a1,
75+
@@ -93,7 +93,7 @@
76+
SPACE=0x00000005)
77+
header=0x0000381502cc (NAME='test/tr',
78+
DB_TRX_ID=0x000000000306,
79+
- DB_ROLL_PTR=0x83000001370110,
80+
+ DB_ROLL_PTR=0x830000032c0110,
81+
ID=0x0000000000000010,
82+
N_COLS=0x00000001,
83+
TYPE=0x00000001,
84+
@@ -103,7 +103,7 @@
85+
SPACE=0x00000001)
86+
header=0x000050150074 (NAME='test/tz',
87+
DB_TRX_ID=0x00000000030c,
88+
- DB_ROLL_PTR=0x860000013a0110,
89+
+ DB_ROLL_PTR=0x86000003300110,
90+
ID=0x0000000000000013,
91+
N_COLS=0x80000001,
92+
TYPE=0x00000023,

‎mysql-test/suite/innodb/r/table_flags,64k.rdiff

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
--- suite/innodb/r/table_flags.result
2+
+++ suite/innodb/r/table_flags,64k.reject
3+
@@ -5,6 +5,8 @@
4+
SET innodb_strict_mode=OFF;
5+
CREATE TABLE tz(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=COMPRESSED
6+
KEY_BLOCK_SIZE=1;
7+
+Warnings:
8+
+Warning 1478 InnoDB: Cannot create a COMPRESSED table when innodb_page_size > 16k. Assuming ROW_FORMAT=DYNAMIC.
9+
SET innodb_strict_mode=ON;
10+
CREATE TABLE tp(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=DYNAMIC
11+
PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9;
12+
@@ -13,7 +15,7 @@
13+
header=0x01000003016e (NAME=0x696e66696d756d00)
14+
header=0x00002815008d (NAME='SYS_DATAFILES',
15+
DB_TRX_ID=0x000000000302,
16+
- DB_ROLL_PTR=0x81000001320194,
17+
+ DB_ROLL_PTR=0x81000001310194,
18+
ID=0x000000000000000e,
19+
N_COLS=0x00000002,
20+
TYPE=0x00000001,
21+
@@ -23,7 +25,7 @@
22+
SPACE=0x00000000)
23+
header=0x0000101500d5 (NAME='SYS_FOREIGN',
24+
DB_TRX_ID=0x000000000300,
25+
- DB_ROLL_PTR=0x800000012d0110,
26+
+ DB_ROLL_PTR=0x800000012c0110,
27+
ID=0x000000000000000b,
28+
N_COLS=0x00000004,
29+
TYPE=0x00000001,
30+
@@ -33,7 +35,7 @@
31+
SPACE=0x00000000)
32+
header=0x000018150122 (NAME='SYS_FOREIGN_COLS',
33+
DB_TRX_ID=0x000000000300,
34+
- DB_ROLL_PTR=0x800000012d0201,
35+
+ DB_ROLL_PTR=0x800000012c0201,
36+
ID=0x000000000000000c,
37+
N_COLS=0x00000004,
38+
TYPE=0x00000001,
39+
@@ -43,7 +45,7 @@
40+
SPACE=0x00000000)
41+
header=0x0400201501b8 (NAME='SYS_TABLESPACES',
42+
DB_TRX_ID=0x000000000302,
43+
- DB_ROLL_PTR=0x81000001320110,
44+
+ DB_ROLL_PTR=0x81000001310110,
45+
ID=0x000000000000000d,
46+
N_COLS=0x00000003,
47+
TYPE=0x00000001,
48+
@@ -53,7 +55,7 @@
49+
SPACE=0x00000000)
50+
header=0x000030150244 (NAME='SYS_VIRTUAL',
51+
DB_TRX_ID=0x000000000304,
52+
- DB_ROLL_PTR=0x82000001350110,
53+
+ DB_ROLL_PTR=0x82000001340110,
54+
ID=0x000000000000000f,
55+
N_COLS=0x00000003,
56+
TYPE=0x00000001,
57+
@@ -63,7 +65,7 @@
58+
SPACE=0x00000000)
59+
header=0x000040150288 (NAME='test/tc',
60+
DB_TRX_ID=0x000000000308,
61+
- DB_ROLL_PTR=0x84000001380110,
62+
+ DB_ROLL_PTR=0x84000001370110,
63+
ID=0x0000000000000011,
64+
N_COLS=0x80000001,
65+
TYPE=0x00000001,
66+
@@ -73,7 +75,7 @@
67+
SPACE=0x00000002)
68+
header=0x000048150310 (NAME='test/td',
69+
DB_TRX_ID=0x00000000030a,
70+
- DB_ROLL_PTR=0x85000001390110,
71+
+ DB_ROLL_PTR=0x85000001380110,
72+
ID=0x0000000000000012,
73+
N_COLS=0x80000001,
74+
TYPE=0x00000021,
75+
@@ -83,7 +85,7 @@
76+
SPACE=0x00000003)
77+
header=0x000058150200 (NAME='test/tp',
78+
DB_TRX_ID=0x00000000030e,
79+
- DB_ROLL_PTR=0x870000013b0110,
80+
+ DB_ROLL_PTR=0x870000013a0110,
81+
ID=0x0000000000000014,
82+
N_COLS=0x80000001,
83+
TYPE=0x000009a1,
84+
@@ -93,7 +95,7 @@
85+
SPACE=0x00000005)
86+
header=0x0000381502cc (NAME='test/tr',
87+
DB_TRX_ID=0x000000000306,
88+
- DB_ROLL_PTR=0x83000001370110,
89+
+ DB_ROLL_PTR=0x83000001360110,
90+
ID=0x0000000000000010,
91+
N_COLS=0x00000001,
92+
TYPE=0x00000001,
93+
@@ -103,10 +105,10 @@
94+
SPACE=0x00000001)
95+
header=0x000050150074 (NAME='test/tz',
96+
DB_TRX_ID=0x00000000030c,
97+
- DB_ROLL_PTR=0x860000013a0110,
98+
+ DB_ROLL_PTR=0x86000001390110,
99+
ID=0x0000000000000013,
100+
N_COLS=0x80000001,
101+
- TYPE=0x00000023,
102+
+ TYPE=0x00000021,
103+
MIX_ID=0x0000000000000000,
104+
MIX_LEN=0x00000050,
105+
CLUSTER_NAME=NULL(0 bytes),

0 commit comments

Comments
 (0)