Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
92627e74
Commit
92627e74
authored
Jul 01, 2015
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add show warnings to test to find out the reason for create failure.
parent
498a264d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
57 additions
and
0 deletions
+57
-0
mysql-test/suite/encryption/r/innodb-page_encryption.result
mysql-test/suite/encryption/r/innodb-page_encryption.result
+15
-0
mysql-test/suite/encryption/r/innodb-page_encryption_compression.result
...te/encryption/r/innodb-page_encryption_compression.result
+4
-0
mysql-test/suite/encryption/r/innodb-page_encryption_log_encryption.result
...encryption/r/innodb-page_encryption_log_encryption.result
+10
-0
mysql-test/suite/encryption/r/innodb_page_encryption_key_change.result
...ite/encryption/r/innodb_page_encryption_key_change.result
+10
-0
mysql-test/suite/encryption/t/innodb-page_encryption.test
mysql-test/suite/encryption/t/innodb-page_encryption.test
+6
-0
mysql-test/suite/encryption/t/innodb-page_encryption_compression.test
...uite/encryption/t/innodb-page_encryption_compression.test
+2
-0
mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.test
...e/encryption/t/innodb-page_encryption_log_encryption.test
+5
-0
mysql-test/suite/encryption/t/innodb_page_encryption_key_change.test
...suite/encryption/t/innodb_page_encryption_key_change.test
+5
-0
No files found.
mysql-test/suite/encryption/r/innodb-page_encryption.result
View file @
92627e74
SET GLOBAL innodb_file_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON;
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
show warnings;
Level Code Message
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
show warnings;
Level Code Message
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=2;
show warnings;
Level Code Message
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=3;
ERROR HY000: Can't create table `test`.`innodb_dynamic` (errno: 140 "Wrong create options")
show warnings;
Level Code Message
Warning 140 InnoDB: ENCRYPTION_KEY_ID 3 not available
Error 1005 Can't create table `test`.`innodb_dynamic` (errno: 140 "Wrong create options")
Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
show warnings;
Level Code Message
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
show warnings;
Level Code Message
set innodb_default_encryption_key_id = 5;
create table innodb_defkey(c1 bigint not null, b char(200)) engine=innodb encrypted=yes;
show create table innodb_defkey;
...
...
mysql-test/suite/encryption/r/innodb-page_encryption_compression.result
View file @
92627e74
...
...
@@ -2,7 +2,11 @@ SET GLOBAL innodb_file_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON;
set global innodb_compression_algorithm = 1;
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb page_compressed=1;
show warnings;
Level Code Message
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;
show warnings;
Level Code Message
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;
show warnings;
Level Code Message
...
...
mysql-test/suite/encryption/r/innodb-page_encryption_log_encryption.result
View file @
92627e74
...
...
@@ -4,10 +4,20 @@ call mtr.add_suppression("InnoDB: Redo log crypto: Can't initialize to key versi
SET GLOBAL innodb_file_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON;
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
show warnings;
Level Code Message
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
show warnings;
Level Code Message
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=2;
show warnings;
Level Code Message
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
show warnings;
Level Code Message
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
show warnings;
Level Code Message
show create table innodb_compact;
Table Create Table
innodb_compact CREATE TABLE `innodb_compact` (
...
...
mysql-test/suite/encryption/r/innodb_page_encryption_key_change.result
View file @
92627e74
...
...
@@ -2,10 +2,20 @@
SET GLOBAL innodb_file_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON;
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
show warnings;
Level Code Message
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=2;
show warnings;
Level Code Message
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=3;
show warnings;
Level Code Message
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=4;
show warnings;
Level Code Message
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=5;
show warnings;
Level Code Message
insert into innodb_normal values (1,'test1'),(2,'foo'),(3,'bar'),(4,'mariadb');
insert into innodb_compact select * from innodb_normal;
insert into innodb_compressed select * from innodb_normal;
...
...
mysql-test/suite/encryption/t/innodb-page_encryption.test
View file @
92627e74
...
...
@@ -10,12 +10,18 @@ SET GLOBAL innodb_file_format = `Barracuda`;
SET
GLOBAL
innodb_file_per_table
=
ON
;
create
table
innodb_normal
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
;
show
warnings
;
create
table
innodb_compact
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
compact
encrypted
=
yes
encryption_key_id
=
1
;
show
warnings
;
create
table
innodb_compressed
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
compressed
encrypted
=
yes
encryption_key_id
=
2
;
show
warnings
;
--
error
ER_CANT_CREATE_TABLE
create
table
innodb_dynamic
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
dynamic
encrypted
=
yes
encryption_key_id
=
3
;
show
warnings
;
create
table
innodb_dynamic
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
dynamic
encrypted
=
yes
encryption_key_id
=
33
;
show
warnings
;
create
table
innodb_redundant
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
redundant
encrypted
=
yes
encryption_key_id
=
4
;
show
warnings
;
set
innodb_default_encryption_key_id
=
5
;
create
table
innodb_defkey
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
encrypted
=
yes
;
...
...
mysql-test/suite/encryption/t/innodb-page_encryption_compression.test
View file @
92627e74
...
...
@@ -15,7 +15,9 @@ SET GLOBAL innodb_file_per_table = ON;
set
global
innodb_compression_algorithm
=
1
;
create
table
innodb_normal
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
page_compressed
=
1
;
show
warnings
;
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
;
show
warnings
;
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
;
show
warnings
;
...
...
mysql-test/suite/encryption/t/innodb-page_encryption_log_encryption.test
View file @
92627e74
...
...
@@ -15,10 +15,15 @@ SET GLOBAL innodb_file_format = `Barracuda`;
SET
GLOBAL
innodb_file_per_table
=
ON
;
create
table
innodb_normal
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
;
show
warnings
;
create
table
innodb_compact
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
compact
encrypted
=
yes
encryption_key_id
=
1
;
show
warnings
;
create
table
innodb_compressed
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
compressed
encrypted
=
yes
encryption_key_id
=
2
;
show
warnings
;
create
table
innodb_dynamic
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
dynamic
encrypted
=
yes
encryption_key_id
=
33
;
show
warnings
;
create
table
innodb_redundant
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
redundant
encrypted
=
yes
encryption_key_id
=
4
;
show
warnings
;
show
create
table
innodb_compact
;
show
create
table
innodb_compressed
;
...
...
mysql-test/suite/encryption/t/innodb_page_encryption_key_change.test
View file @
92627e74
...
...
@@ -16,10 +16,15 @@ SET GLOBAL innodb_file_format = `Barracuda`;
SET
GLOBAL
innodb_file_per_table
=
ON
;
create
table
innodb_normal
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
;
show
warnings
;
create
table
innodb_compact
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
compact
encrypted
=
yes
encryption_key_id
=
2
;
show
warnings
;
create
table
innodb_compressed
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
compressed
encrypted
=
yes
encryption_key_id
=
3
;
show
warnings
;
create
table
innodb_dynamic
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
dynamic
encrypted
=
yes
encryption_key_id
=
4
;
show
warnings
;
create
table
innodb_redundant
(
c1
bigint
not
null
,
b
char
(
200
))
engine
=
innodb
row_format
=
redundant
encrypted
=
yes
encryption_key_id
=
5
;
show
warnings
;
insert
into
innodb_normal
values
(
1
,
'test1'
),(
2
,
'foo'
),(
3
,
'bar'
),(
4
,
'mariadb'
);
insert
into
innodb_compact
select
*
from
innodb_normal
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment