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
e9e18901
Commit
e9e18901
authored
Mar 25, 2021
by
Eugene Kosov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-25223 follow-up: do not create an iterator from nullptr
parent
b5cea823
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
storage/innobase/fil/fil0crypt.cc
storage/innobase/fil/fil0crypt.cc
+6
-3
No files found.
storage/innobase/fil/fil0crypt.cc
View file @
e9e18901
...
...
@@ -1482,7 +1482,7 @@ encryption parameters were changed
@param encrypt expected state of innodb_encrypt_tables
@return the next tablespace
@retval fil_system.temp_space if there is no work to do
@retval
nullptr
upon reaching the end of the iteration */
@retval
end()
upon reaching the end of the iteration */
space_list_t
::
iterator
fil_space_t
::
next
(
space_list_t
::
iterator
space
,
bool
recheck
,
bool
encrypt
)
{
...
...
@@ -1490,9 +1490,12 @@ space_list_t::iterator fil_space_t::next(space_list_t::iterator space,
if
(
!
srv_fil_crypt_rotate_key_age
)
{
space
=
space_list_t
::
iterator
(
fil_system
.
keyrotate_next
(
fil_space_t
*
next_space
=
fil_system
.
keyrotate_next
(
space
!=
fil_system
.
space_list
.
end
()
?
&*
space
:
nullptr
,
recheck
,
encrypt
));
encrypt
);
space
=
next_space
?
space_list_t
::
iterator
(
next_space
)
:
fil_system
.
space_list
.
end
();
}
else
{
...
...
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