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
93371739
Commit
93371739
authored
Oct 05, 2015
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-8893: Test encryption.innodb_encryption_filekeys fails on buildbot
parent
ba0b6685
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
mysql-test/suite/encryption/r/innodb_encryption_filekeys.result
...test/suite/encryption/r/innodb_encryption_filekeys.result
+1
-0
mysql-test/suite/encryption/t/innodb_encryption_filekeys.test
...l-test/suite/encryption/t/innodb_encryption_filekeys.test
+7
-3
No files found.
mysql-test/suite/encryption/r/innodb_encryption_filekeys.result
View file @
93371739
call mtr.add_suppression("trying to do an operation on a dropped tablespace .*");
SET GLOBAL innodb_file_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON;
SET GLOBAL innodb_encrypt_tables = OFF;
...
...
mysql-test/suite/encryption/t/innodb_encryption_filekeys.test
View file @
93371739
...
...
@@ -3,6 +3,8 @@
# embedded does not support restart
--
source
include
/
not_embedded
.
inc
call
mtr
.
add_suppression
(
"trying to do an operation on a dropped tablespace .*"
);
--
disable_query_log
let
$innodb_file_format_orig
=
`SELECT @@innodb_file_format`
;
let
$innodb_file_per_table_orig
=
`SELECT @@innodb_file_per_table`
;
...
...
@@ -129,9 +131,6 @@ SELECT COUNT(1) FROM t3;
SELECT
COUNT
(
1
)
FROM
t4
;
SELECT
COUNT
(
1
)
FROM
t5
;
drop
table
t1
,
t2
,
t3
,
t4
,
t5
;
set
GLOBAL
innodb_default_encryption_key_id
=
1
;
# reset system
--
disable_query_log
EVAL
SET
GLOBAL
innodb_file_per_table
=
$innodb_file_per_table_orig
;
...
...
@@ -139,3 +138,8 @@ EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
EVAL
SET
GLOBAL
innodb_encrypt_tables
=
$encrypt_tables
;
EVAL
SET
GLOBAL
innodb_encryption_threads
=
$threads
;
--
enable_query_log
drop
table
t1
,
t2
,
t3
,
t4
,
t5
;
set
GLOBAL
innodb_default_encryption_key_id
=
1
;
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