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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1bfa37a7
Commit
1bfa37a7
authored
Oct 24, 2016
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add more information if encryption information is already stored for
tablespace but page0 is not yet read.
parent
ec5bd0d3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
storage/innobase/fil/fil0fil.cc
storage/innobase/fil/fil0fil.cc
+8
-1
storage/xtradb/fil/fil0fil.cc
storage/xtradb/fil/fil0fil.cc
+8
-1
No files found.
storage/innobase/fil/fil0fil.cc
View file @
1bfa37a7
...
...
@@ -7286,7 +7286,14 @@ fil_space_get_crypt_data(
crypt_data
=
space
->
crypt_data
;
ut_ad
(
space
->
page_0_crypt_read
);
if
(
!
space
->
page_0_crypt_read
)
{
ib_logf
(
IB_LOG_LEVEL_WARN
,
"Space %lu name %s contains encryption %d information for key_id %d but page0 is not read."
,
space
->
id
,
space
->
name
,
space
->
crypt_data
?
space
->
crypt_data
->
encryption
:
0
,
space
->
crypt_data
?
space
->
crypt_data
->
key_id
:
0
);
}
}
return
(
crypt_data
);
...
...
storage/xtradb/fil/fil0fil.cc
View file @
1bfa37a7
...
...
@@ -7390,7 +7390,14 @@ fil_space_get_crypt_data(
crypt_data
=
space
->
crypt_data
;
ut_ad
(
space
->
page_0_crypt_read
);
if
(
!
space
->
page_0_crypt_read
)
{
ib_logf
(
IB_LOG_LEVEL_WARN
,
"Space %lu name %s contains encryption %d information for key_id %d but page0 is not read."
,
space
->
id
,
space
->
name
,
space
->
crypt_data
?
space
->
crypt_data
->
encryption
:
0
,
space
->
crypt_data
?
space
->
crypt_data
->
key_id
:
0
);
}
}
return
(
crypt_data
);
...
...
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