Skip to content

Commit bc9f118

Browse files
vuvovavuvova
committed
rename table attribute ENCRYPTION=ON/OFF to ENCRYPTED=YES/NO
1 parent ea764f5 commit bc9f118

20 files changed

+105
-105
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@ call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed fro
22
SET GLOBAL innodb_file_format = `Barracuda`;
33
SET GLOBAL innodb_file_per_table = ON;
44
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;
5+
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
6+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=3;
7+
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
88
show create table innodb_compact;
99
Table Create Table
1010
innodb_compact CREATE TABLE `innodb_compact` (
1111
`c1` bigint(20) NOT NULL,
1212
`b` char(200) DEFAULT NULL
13-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encryption`='ON' `encryption_key_id`=1
13+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encrypted`=yes `encryption_key_id`=1
1414
show create table innodb_dynamic;
1515
Table Create Table
1616
innodb_dynamic CREATE TABLE `innodb_dynamic` (
1717
`c1` bigint(20) NOT NULL,
1818
`b` char(200) DEFAULT NULL
19-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encryption`='ON' `encryption_key_id`=3
19+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encrypted`=yes `encryption_key_id`=3
2020
show create table innodb_redundant;
2121
Table Create Table
2222
innodb_redundant CREATE TABLE `innodb_redundant` (
2323
`c1` bigint(20) NOT NULL,
2424
`b` char(200) DEFAULT NULL
25-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encryption`='ON' `encryption_key_id`=4
25+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encrypted`=yes `encryption_key_id`=4
2626
create procedure innodb_insert_proc (repeat_count int)
2727
begin
2828
declare current_num int;
@@ -64,14 +64,14 @@ count(*)
6464
select count(*) from innodb_redundant where c1 < 1500000;
6565
count(*)
6666
5000
67-
alter table innodb_compact engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
67+
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
6868
show create table innodb_compact;
6969
Table Create Table
7070
innodb_compact CREATE TABLE `innodb_compact` (
7171
`c1` bigint(20) NOT NULL,
7272
`b` char(200) DEFAULT NULL
7373
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
74-
alter table innodb_dynamic engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
74+
alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
7575
Warnings:
7676
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
7777
Warning 1478 InnoDB: assuming ROW_FORMAT=COMPACT.
@@ -81,7 +81,7 @@ innodb_dynamic CREATE TABLE `innodb_dynamic` (
8181
`c1` bigint(20) NOT NULL,
8282
`b` char(200) DEFAULT NULL
8383
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
84-
alter table innodb_redundant engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
84+
alter table innodb_redundant engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
8585
show create table innodb_redundant;
8686
Table Create Table
8787
innodb_redundant CREATE TABLE `innodb_redundant` (

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
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 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;
4+
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
5+
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=2;
6+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=3;
77
ERROR HY000: Can't create table `test`.`innodb_dynamic` (errno: 140 "Wrong create options")
8-
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encryption='ON' encryption_key_id=33;
9-
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encryption='ON' encryption_key_id=4;
8+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
9+
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
1010
set innodb_default_encryption_key_id = 5;
11-
create table innodb_defkey(c1 bigint not null, b char(200)) engine=innodb encryption='ON';
11+
create table innodb_defkey(c1 bigint not null, b char(200)) engine=innodb encrypted=yes;
1212
show create table innodb_defkey;
1313
Table Create Table
1414
innodb_defkey CREATE TABLE `innodb_defkey` (
1515
`c1` bigint(20) NOT NULL,
1616
`b` char(200) DEFAULT NULL
17-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encryption`='ON' `ENCRYPTION_KEY_ID`=5
17+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `ENCRYPTION_KEY_ID`=5
1818
show create table innodb_compact;
1919
Table Create Table
2020
innodb_compact CREATE TABLE `innodb_compact` (
2121
`c1` bigint(20) NOT NULL,
2222
`b` char(200) DEFAULT NULL
23-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encryption`='ON' `encryption_key_id`=1
23+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encrypted`=yes `encryption_key_id`=1
2424
show create table innodb_compressed;
2525
Table Create Table
2626
innodb_compressed CREATE TABLE `innodb_compressed` (
2727
`c1` bigint(20) NOT NULL,
2828
`b` char(200) DEFAULT NULL
29-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `encryption`='ON' `encryption_key_id`=2
29+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `encrypted`=yes `encryption_key_id`=2
3030
show create table innodb_dynamic;
3131
Table Create Table
3232
innodb_dynamic CREATE TABLE `innodb_dynamic` (
3333
`c1` bigint(20) NOT NULL,
3434
`b` char(200) DEFAULT NULL
35-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encryption`='ON' `encryption_key_id`=33
35+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encrypted`=yes `encryption_key_id`=33
3636
show create table innodb_redundant;
3737
Table Create Table
3838
innodb_redundant CREATE TABLE `innodb_redundant` (
3939
`c1` bigint(20) NOT NULL,
4040
`b` char(200) DEFAULT NULL
41-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encryption`='ON' `encryption_key_id`=4
41+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encrypted`=yes `encryption_key_id`=4
4242
create procedure innodb_insert_proc (repeat_count int)
4343
begin
4444
declare current_num int;
@@ -154,28 +154,28 @@ variable_value >= 0
154154
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted';
155155
variable_value >= 0
156156
1
157-
alter table innodb_compact engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
157+
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
158158
show create table innodb_compact;
159159
Table Create Table
160160
innodb_compact CREATE TABLE `innodb_compact` (
161161
`c1` bigint(20) NOT NULL,
162162
`b` char(200) DEFAULT NULL
163163
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
164-
alter table innodb_compressed engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
164+
alter table innodb_compressed engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
165165
show create table innodb_compressed;
166166
Table Create Table
167167
innodb_compressed CREATE TABLE `innodb_compressed` (
168168
`c1` bigint(20) NOT NULL,
169169
`b` char(200) DEFAULT NULL
170170
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
171-
alter table innodb_dynamic engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
171+
alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
172172
show create table innodb_dynamic;
173173
Table Create Table
174174
innodb_dynamic CREATE TABLE `innodb_dynamic` (
175175
`c1` bigint(20) NOT NULL,
176176
`b` char(200) DEFAULT NULL
177177
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
178-
alter table innodb_redundant engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
178+
alter table innodb_redundant engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
179179
show create table innodb_redundant;
180180
Table Create Table
181181
innodb_redundant CREATE TABLE `innodb_redundant` (
@@ -213,7 +213,7 @@ Table Create Table
213213
innodb_defkey CREATE TABLE `innodb_defkey` (
214214
`c1` bigint(20) NOT NULL,
215215
`b` char(200) DEFAULT NULL
216-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encryption`='ON' `ENCRYPTION_KEY_ID`=5
216+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `ENCRYPTION_KEY_ID`=5
217217
update innodb_normal set c1 = c1 +1;
218218
update innodb_compact set c1 = c1 + 1;
219219
update innodb_compressed set c1 = c1 + 1;

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

Lines changed: 6 additions & 6 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 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;
5+
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1 page_compressed=1;
6+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes 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 `encryption`='ON' `encryption_key_id`=1 `page_compressed`=1
20+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encrypted`=yes `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 `encryption`='ON' `encryption_key_id`=2 `page_compressed`=1
26+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encrypted`=yes `encryption_key_id`=2 `page_compressed`=1
2727
create procedure innodb_insert_proc (repeat_count int)
2828
begin
2929
declare current_num int;
@@ -110,14 +110,14 @@ innodb_normal CREATE TABLE `innodb_normal` (
110110
`c1` bigint(20) NOT NULL,
111111
`b` char(200) DEFAULT NULL
112112
) ENGINE=InnoDB DEFAULT CHARSET=latin1
113-
alter table innodb_compact engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT page_compressed=DEFAULT;
113+
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT page_compressed=DEFAULT;
114114
show create table innodb_compact;
115115
Table Create Table
116116
innodb_compact CREATE TABLE `innodb_compact` (
117117
`c1` bigint(20) NOT NULL,
118118
`b` char(200) DEFAULT NULL
119119
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
120-
alter table innodb_dynamic engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT page_compressed=DEFAULT;
120+
alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT page_compressed=DEFAULT;
121121
show create table innodb_dynamic;
122122
Table Create Table
123123
innodb_dynamic CREATE TABLE `innodb_dynamic` (

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,34 @@ call mtr.add_suppression("InnoDB: Redo log crypto: Can't initialize to key versi
44
SET GLOBAL innodb_file_format = `Barracuda`;
55
SET GLOBAL innodb_file_per_table = ON;
66
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
7-
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encryption='ON' encryption_key_id=1;
8-
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encryption='ON' encryption_key_id=2;
9-
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encryption='ON' encryption_key_id=33;
10-
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encryption='ON' encryption_key_id=4;
7+
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
8+
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=2;
9+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
10+
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
1111
show create table innodb_compact;
1212
Table Create Table
1313
innodb_compact CREATE TABLE `innodb_compact` (
1414
`c1` bigint(20) NOT NULL,
1515
`b` char(200) DEFAULT NULL
16-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encryption`='ON' `encryption_key_id`=1
16+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encrypted`=yes `encryption_key_id`=1
1717
show create table innodb_compressed;
1818
Table Create Table
1919
innodb_compressed CREATE TABLE `innodb_compressed` (
2020
`c1` bigint(20) NOT NULL,
2121
`b` char(200) DEFAULT NULL
22-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `encryption`='ON' `encryption_key_id`=2
22+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `encrypted`=yes `encryption_key_id`=2
2323
show create table innodb_dynamic;
2424
Table Create Table
2525
innodb_dynamic CREATE TABLE `innodb_dynamic` (
2626
`c1` bigint(20) NOT NULL,
2727
`b` char(200) DEFAULT NULL
28-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encryption`='ON' `encryption_key_id`=33
28+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encrypted`=yes `encryption_key_id`=33
2929
show create table innodb_redundant;
3030
Table Create Table
3131
innodb_redundant CREATE TABLE `innodb_redundant` (
3232
`c1` bigint(20) NOT NULL,
3333
`b` char(200) DEFAULT NULL
34-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encryption`='ON' `encryption_key_id`=4
34+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encrypted`=yes `encryption_key_id`=4
3535
create procedure innodb_insert_proc (repeat_count int)
3636
begin
3737
declare current_num int;
@@ -130,28 +130,28 @@ variable_value >= 0
130130
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_decrypted';
131131
variable_value >= 0
132132
1
133-
alter table innodb_compact engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
133+
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
134134
show create table innodb_compact;
135135
Table Create Table
136136
innodb_compact CREATE TABLE `innodb_compact` (
137137
`c1` bigint(20) NOT NULL,
138138
`b` char(200) DEFAULT NULL
139139
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
140-
alter table innodb_compressed engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
140+
alter table innodb_compressed engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
141141
show create table innodb_compressed;
142142
Table Create Table
143143
innodb_compressed CREATE TABLE `innodb_compressed` (
144144
`c1` bigint(20) NOT NULL,
145145
`b` char(200) DEFAULT NULL
146146
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
147-
alter table innodb_dynamic engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
147+
alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
148148
show create table innodb_dynamic;
149149
Table Create Table
150150
innodb_dynamic CREATE TABLE `innodb_dynamic` (
151151
`c1` bigint(20) NOT NULL,
152152
`b` char(200) DEFAULT NULL
153153
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
154-
alter table innodb_redundant engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
154+
alter table innodb_redundant engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
155155
show create table innodb_redundant;
156156
Table Create Table
157157
innodb_redundant CREATE TABLE `innodb_redundant` (

‎mysql-test/suite/innodb/t/innodb-page_encryption-32k.test

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ SET GLOBAL innodb_file_format = `Barracuda`;
1717
SET GLOBAL innodb_file_per_table = ON;
1818

1919
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
20-
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encryption='ON' encryption_key_id=1;
21-
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encryption='ON' encryption_key_id=3;
22-
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encryption='ON' encryption_key_id=4;
20+
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
21+
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=3;
22+
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
2323

2424
show create table innodb_compact;
2525
show create table innodb_dynamic;
@@ -63,11 +63,11 @@ select count(*) from innodb_compact where c1 < 1500000;
6363
select count(*) from innodb_dynamic where c1 < 1500000;
6464
select count(*) from innodb_redundant where c1 < 1500000;
6565

66-
alter table innodb_compact engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
66+
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
6767
show create table innodb_compact;
68-
alter table innodb_dynamic engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
68+
alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
6969
show create table innodb_dynamic;
70-
alter table innodb_redundant engine=innodb encryption=DEFAULT encryption_key_id=DEFAULT;
70+
alter table innodb_redundant engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
7171
show create table innodb_redundant;
7272

7373
--source include/restart_mysqld.inc

0 commit comments

Comments
 (0)