Skip to content

Commit 4865fd1

Browse files
Jan Lindströmvuvova
Jan Lindström
authored and
vuvova
committed
InnoDB/XtraDB Encryption cleanup
Step 5: -- Rename encryption_key -> encryption_key_id -- Remove unnecessary code -- Fix few bugs found -- Fix test cases and results files
1 parent af768c2 commit 4865fd1

37 files changed

+466
-437
lines changed

‎mysql-test/suite/innodb/r/innodb-page_encryption-32k.result

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
2+
SET GLOBAL innodb_file_format = `Barracuda`;
3+
SET GLOBAL innodb_file_per_table = ON;
4+
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
5+
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encryption='ON' encryption_key_id=1;
6+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encryption='ON' encryption_key_id=3;
7+
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encryption='ON' encryption_key_id=4;
8+
show create table innodb_compact;
9+
Table Create Table
10+
innodb_compact CREATE TABLE `innodb_compact` (
11+
`c1` bigint(20) NOT NULL,
12+
`b` char(200) DEFAULT NULL
13+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encryption`='ON' `encryption_key_id`=1
14+
show create table innodb_dynamic;
15+
Table Create Table
16+
innodb_dynamic CREATE TABLE `innodb_dynamic` (
17+
`c1` bigint(20) NOT NULL,
18+
`b` char(200) DEFAULT NULL
19+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encryption`='ON' `encryption_key_id`=3
20+
show create table innodb_redundant;
21+
Table Create Table
22+
innodb_redundant CREATE TABLE `innodb_redundant` (
23+
`c1` bigint(20) NOT NULL,
24+
`b` char(200) DEFAULT NULL
25+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encryption`='ON' `encryption_key_id`=4
26+
create procedure innodb_insert_proc (repeat_count int)
27+
begin
28+
declare current_num int;
29+
set current_num = 0;
30+
while current_num < repeat_count do
31+
insert into innodb_normal values(current_num, substring(MD5(RAND()), -150));
32+
set current_num = current_num + 1;
33+
end while;
34+
end//
35+
commit;
36+
set autocommit=0;
37+
call innodb_insert_proc(5000);
38+
commit;
39+
set autocommit=1;
40+
insert into innodb_compact select * from innodb_normal;
41+
insert into innodb_dynamic select * from innodb_normal;
42+
insert into innodb_redundant select * from innodb_normal;
43+
update innodb_compact set c1 = c1 + 1;
44+
update innodb_dynamic set c1 = c1 + 1;
45+
update innodb_redundant set c1 = c1 + 1;
46+
select count(*) from innodb_compact where c1 < 1500000;
47+
count(*)
48+
5000
49+
select count(*) from innodb_dynamic where c1 < 1500000;
50+
count(*)
51+
5000
52+
select count(*) from innodb_redundant where c1 < 1500000;
53+
count(*)
54+
5000
55+
update innodb_compact set c1 = c1 + 1;
56+
update innodb_dynamic set c1 = c1 + 1;
57+
update innodb_redundant set c1 = c1 + 1;
58+
select count(*) from innodb_compact where c1 < 1500000;
59+
count(*)
60+
5000
61+
select count(*) from innodb_dynamic where c1 < 1500000;
62+
count(*)
63+
5000
64+
select count(*) from innodb_redundant where c1 < 1500000;
65+
count(*)
66+
5000
67+
alter table innodb_compact engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
68+
show create table innodb_compact;
69+
Table Create Table
70+
innodb_compact CREATE TABLE `innodb_compact` (
71+
`c1` bigint(20) NOT NULL,
72+
`b` char(200) DEFAULT NULL
73+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
74+
alter table innodb_dynamic engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
75+
Warnings:
76+
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
77+
Warning 1478 InnoDB: assuming ROW_FORMAT=COMPACT.
78+
show create table innodb_dynamic;
79+
Table Create Table
80+
innodb_dynamic CREATE TABLE `innodb_dynamic` (
81+
`c1` bigint(20) NOT NULL,
82+
`b` char(200) DEFAULT NULL
83+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
84+
alter table innodb_redundant engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
85+
show create table innodb_redundant;
86+
Table Create Table
87+
innodb_redundant CREATE TABLE `innodb_redundant` (
88+
`c1` bigint(20) NOT NULL,
89+
`b` char(200) DEFAULT NULL
90+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
91+
show create table innodb_compact;
92+
Table Create Table
93+
innodb_compact CREATE TABLE `innodb_compact` (
94+
`c1` bigint(20) NOT NULL,
95+
`b` char(200) DEFAULT NULL
96+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
97+
show create table innodb_dynamic;
98+
Table Create Table
99+
innodb_dynamic CREATE TABLE `innodb_dynamic` (
100+
`c1` bigint(20) NOT NULL,
101+
`b` char(200) DEFAULT NULL
102+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
103+
show create table innodb_redundant;
104+
Table Create Table
105+
innodb_redundant CREATE TABLE `innodb_redundant` (
106+
`c1` bigint(20) NOT NULL,
107+
`b` char(200) DEFAULT NULL
108+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
109+
update innodb_compact set c1 = c1 + 1;
110+
update innodb_dynamic set c1 = c1 + 1;
111+
update innodb_redundant set c1 = c1 + 1;
112+
select count(*) from innodb_compact where c1 < 1500000;
113+
count(*)
114+
5000
115+
select count(*) from innodb_dynamic where c1 < 1500000;
116+
count(*)
117+
5000
118+
select count(*) from innodb_redundant where c1 < 1500000;
119+
count(*)
120+
5000
121+
drop procedure innodb_insert_proc;
122+
drop table innodb_normal;
123+
drop table innodb_compact;
124+
drop table innodb_dynamic;
125+
drop table innodb_redundant;

‎mysql-test/suite/innodb/r/innodb-page_encryption.result

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
SET GLOBAL innodb_file_format = `Barracuda`;
22
SET GLOBAL innodb_file_per_table = ON;
33
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
4-
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact page_encryption=1 page_encryption_key=1;
5-
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed page_encryption=1 page_encryption_key=2;
6-
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic page_encryption=1 page_encryption_key=3;
7-
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant page_encryption=1 page_encryption_key=4;
8-
SET GLOBAL innodb_default_page_encryption_key = 5;
9-
create table innodb_defkey(c1 bigint not null, b char(200)) engine=innodb page_encryption=1;
4+
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encryption='ON' encryption_key_id=1;
5+
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encryption='ON' encryption_key_id=2;
6+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encryption='ON' encryption_key_id=3;
7+
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encryption='ON' encryption_key_id=4;
8+
SET GLOBAL innodb_default_encryption_key = 5;
9+
create table innodb_defkey(c1 bigint not null, b char(200)) engine=innodb encryption='ON';
1010
show create table innodb_defkey;
1111
Table Create Table
1212
innodb_defkey CREATE TABLE `innodb_defkey` (
1313
`c1` bigint(20) NOT NULL,
1414
`b` char(200) DEFAULT NULL
15-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `page_encryption`=1
15+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encryption`='ON'
1616
show create table innodb_compact;
1717
Table Create Table
1818
innodb_compact CREATE TABLE `innodb_compact` (
1919
`c1` bigint(20) NOT NULL,
2020
`b` char(200) DEFAULT NULL
21-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `page_encryption`=1 `page_encryption_key`=1
21+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encryption`='ON' `encryption_key_id`=1
2222
show create table innodb_compressed;
2323
Table Create Table
2424
innodb_compressed CREATE TABLE `innodb_compressed` (
2525
`c1` bigint(20) NOT NULL,
2626
`b` char(200) DEFAULT NULL
27-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `page_encryption`=1 `page_encryption_key`=2
27+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `encryption`='ON' `encryption_key_id`=2
2828
show create table innodb_dynamic;
2929
Table Create Table
3030
innodb_dynamic CREATE TABLE `innodb_dynamic` (
3131
`c1` bigint(20) NOT NULL,
3232
`b` char(200) DEFAULT NULL
33-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `page_encryption`=1 `page_encryption_key`=3
33+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encryption`='ON' `encryption_key_id`=3
3434
show create table innodb_redundant;
3535
Table Create Table
3636
innodb_redundant CREATE TABLE `innodb_redundant` (
3737
`c1` bigint(20) NOT NULL,
3838
`b` char(200) DEFAULT NULL
39-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `page_encryption`=1 `page_encryption_key`=4
39+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encryption`='ON' `encryption_key_id`=4
4040
create procedure innodb_insert_proc (repeat_count int)
4141
begin
4242
declare current_num int;
@@ -97,15 +97,12 @@ select count(*) from innodb_defkey t1, innodb_normal t2 where
9797
t1.c1 = t2.c1 and t1.b = t2.b;
9898
count(*)
9999
2000
100-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
100+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_encrypted';
101101
variable_value >= 0
102102
1
103-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decrypted';
103+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted';
104104
variable_value >= 0
105105
1
106-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encryption_error';
107-
variable_value = 0
108-
1
109106
SET GLOBAL innodb_file_format = `Barracuda`;
110107
SET GLOBAL innodb_file_per_table = ON;
111108
update innodb_normal set c1 = c1 +1;
@@ -149,37 +146,34 @@ select count(*) from innodb_defkey t1, innodb_normal t2 where
149146
t1.c1 = t2.c1 and t1.b = t2.b;
150147
count(*)
151148
2000
152-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
149+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_encrypted';
153150
variable_value >= 0
154151
1
155-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decrypted';
152+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted';
156153
variable_value >= 0
157154
1
158-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encryption_error';
159-
variable_value = 0
160-
1
161-
alter table innodb_compact engine=innodb page_encryption=DEFAULT page_encryption_key=DEFAULT;
155+
alter table innodb_compact engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
162156
show create table innodb_compact;
163157
Table Create Table
164158
innodb_compact CREATE TABLE `innodb_compact` (
165159
`c1` bigint(20) NOT NULL,
166160
`b` char(200) DEFAULT NULL
167161
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
168-
alter table innodb_compressed engine=innodb page_encryption=DEFAULT page_encryption_key=DEFAULT;
162+
alter table innodb_compressed engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
169163
show create table innodb_compressed;
170164
Table Create Table
171165
innodb_compressed CREATE TABLE `innodb_compressed` (
172166
`c1` bigint(20) NOT NULL,
173167
`b` char(200) DEFAULT NULL
174168
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
175-
alter table innodb_dynamic engine=innodb page_encryption=DEFAULT page_encryption_key=DEFAULT;
169+
alter table innodb_dynamic engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
176170
show create table innodb_dynamic;
177171
Table Create Table
178172
innodb_dynamic CREATE TABLE `innodb_dynamic` (
179173
`c1` bigint(20) NOT NULL,
180174
`b` char(200) DEFAULT NULL
181175
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
182-
alter table innodb_redundant engine=innodb page_encryption=DEFAULT page_encryption_key=DEFAULT;
176+
alter table innodb_redundant engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
183177
show create table innodb_redundant;
184178
Table Create Table
185179
innodb_redundant CREATE TABLE `innodb_redundant` (
@@ -217,7 +211,7 @@ Table Create Table
217211
innodb_defkey CREATE TABLE `innodb_defkey` (
218212
`c1` bigint(20) NOT NULL,
219213
`b` char(200) DEFAULT NULL
220-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `page_encryption`=1
214+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encryption`='ON'
221215
update innodb_normal set c1 = c1 +1;
222216
update innodb_compact set c1 = c1 + 1;
223217
update innodb_compressed set c1 = c1 + 1;
@@ -251,13 +245,10 @@ select count(*) from innodb_redundant t1, innodb_normal t2 where
251245
t1.c1 = t2.c1 and t1.b = t2.b;
252246
count(*)
253247
2000
254-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
255-
variable_value = 0
256-
1
257-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decrypted';
248+
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_encrypted';
258249
variable_value = 0
259250
1
260-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encryption_error';
251+
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted';
261252
variable_value = 0
262253
1
263254
drop procedure innodb_insert_proc;

‎mysql-test/suite/innodb/r/innodb-page_encryption_compression.result

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ SET GLOBAL innodb_file_format = `Barracuda`;
22
SET GLOBAL innodb_file_per_table = ON;
33
set global innodb_compression_algorithm = 1;
44
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb page_compressed=1;
5-
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact page_encryption=1 page_encryption_key=1 page_compressed=1;
6-
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic page_encryption=1 page_encryption_key=2 page_compressed=1;
5+
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encryption='ON' encryption_key_id=1 page_compressed=1;
6+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encryption='ON' encryption_key_id=2 page_compressed=1;
77
show warnings;
88
Level Code Message
99
show create table innodb_normal;
@@ -17,13 +17,13 @@ Table Create Table
1717
innodb_compact CREATE TABLE `innodb_compact` (
1818
`c1` bigint(20) NOT NULL,
1919
`b` char(200) DEFAULT NULL
20-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `page_encryption`=1 `page_encryption_key`=1 `page_compressed`=1
20+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encryption`='ON' `encryption_key_id`=1 `page_compressed`=1
2121
show create table innodb_dynamic;
2222
Table Create Table
2323
innodb_dynamic CREATE TABLE `innodb_dynamic` (
2424
`c1` bigint(20) NOT NULL,
2525
`b` char(200) DEFAULT NULL
26-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `page_encryption`=1 `page_encryption_key`=2 `page_compressed`=1
26+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encryption`='ON' `encryption_key_id`=2 `page_compressed`=1
2727
create procedure innodb_insert_proc (repeat_count int)
2828
begin
2929
declare current_num int;
@@ -60,21 +60,16 @@ select count(*) from innodb_dynamic t1, innodb_normal t2 where
6060
t1.c1 = t2.c1 and t1.b = t2.b;
6161
count(*)
6262
5000
63-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
63+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_encrypted';
6464
variable_value >= 0
6565
1
66-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decrypted';
66+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted';
6767
variable_value >= 0
6868
1
69-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encryption_error';
70-
variable_value = 0
71-
1
72-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_compressed';
69+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_compressed';
7370
variable_value >= 0
74-
1
75-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decompressed';
71+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decompressed';
7672
variable_value >= 0
77-
1
7873
SET GLOBAL innodb_file_format = `Barracuda`;
7974
SET GLOBAL innodb_file_per_table = ON;
8075
set global innodb_compression_algorithm = 1;
@@ -98,36 +93,31 @@ select count(*) from innodb_dynamic t1, innodb_normal t2 where
9893
t1.c1 = t2.c1 and t1.b = t2.b;
9994
count(*)
10095
5000
101-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
96+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_encrypted';
10297
variable_value >= 0
10398
1
104-
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decrypted';
99+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted';
105100
variable_value >= 0
106101
1
107-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encryption_error';
108-
variable_value = 0
109-
1
110-
SELECT variable_value > 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_compressed';
111-
variable_value > 0
112-
1
113-
SELECT variable_value > 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decompressed';
114-
variable_value > 0
115-
1
102+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_compressed';
103+
variable_value >= 0
104+
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decompressed';
105+
variable_value >= 0
116106
alter table innodb_normal engine=innodb page_compressed=DEFAULT;
117107
show create table innodb_normal;
118108
Table Create Table
119109
innodb_normal CREATE TABLE `innodb_normal` (
120110
`c1` bigint(20) NOT NULL,
121111
`b` char(200) DEFAULT NULL
122112
) ENGINE=InnoDB DEFAULT CHARSET=latin1
123-
alter table innodb_compact engine=innodb page_encryption=DEFAULT page_encryption_key=DEFAULT page_compressed=DEFAULT;
113+
alter table innodb_compact engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT page_compressed=DEFAULT;
124114
show create table innodb_compact;
125115
Table Create Table
126116
innodb_compact CREATE TABLE `innodb_compact` (
127117
`c1` bigint(20) NOT NULL,
128118
`b` char(200) DEFAULT NULL
129119
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
130-
alter table innodb_dynamic engine=innodb page_encryption=DEFAULT page_encryption_key=DEFAULT page_compressed=DEFAULT;
120+
alter table innodb_dynamic engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT page_compressed=DEFAULT;
131121
show create table innodb_dynamic;
132122
Table Create Table
133123
innodb_dynamic CREATE TABLE `innodb_dynamic` (
@@ -174,21 +164,16 @@ select count(*) from innodb_dynamic t1, innodb_normal t2 where
174164
t1.c1 = t2.c1 and t1.b = t2.b;
175165
count(*)
176166
5000
177-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
167+
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_encrypted';
178168
variable_value = 0
179169
1
180-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decrypted';
170+
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted';
181171
variable_value = 0
182172
1
183-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encryption_error';
173+
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_compressed';
184174
variable_value = 0
185-
1
186-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_compressed';
175+
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decompressed';
187176
variable_value = 0
188-
1
189-
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_decompressed';
190-
variable_value = 0
191-
1
192177
drop procedure innodb_insert_proc;
193178
drop table innodb_normal;
194179
drop table innodb_compact;

0 commit comments

Comments
 (0)