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
c164d0cc
Commit
c164d0cc
authored
Aug 23, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fil_name_process(): Remove unused return value
parent
9a815401
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
storage/innobase/log/log0recv.cc
storage/innobase/log/log0recv.cc
+3
-10
No files found.
storage/innobase/log/log0recv.cc
View file @
c164d0cc
...
...
@@ -194,11 +194,9 @@ void (*log_file_op)(ulint space_id, const byte* flags,
@param[in,out] name file name
@param[in] len length of the file name
@param[in] space_id the tablespace ID
@param[in] deleted whether this is a MLOG_FILE_DELETE record
@retval true if able to process file successfully.
@retval false if unable to process the file */
@param[in] deleted whether this is a MLOG_FILE_DELETE record */
static
bool
void
fil_name_process
(
char
*
name
,
ulint
len
,
...
...
@@ -206,15 +204,13 @@ fil_name_process(
bool
deleted
)
{
if
(
srv_operation
==
SRV_OPERATION_BACKUP
)
{
return
true
;
return
;
}
ut_ad
(
srv_operation
==
SRV_OPERATION_NORMAL
||
srv_operation
==
SRV_OPERATION_RESTORE
||
srv_operation
==
SRV_OPERATION_RESTORE_EXPORT
);
bool
processed
=
true
;
/* We will also insert space=NULL into the map, so that
further checks can ensure that a MLOG_FILE_NAME record was
scanned before applying any page records for the space_id. */
...
...
@@ -261,7 +257,6 @@ fil_name_process(
<<
f
.
name
<<
"' and '"
<<
name
<<
"'."
" You must delete one of them."
;
recv_sys
->
found_corrupt_fs
=
true
;
processed
=
false
;
}
break
;
...
...
@@ -314,7 +309,6 @@ fil_name_process(
" remove the .ibd file, you can set"
" --innodb_force_recovery."
;
recv_sys
->
found_corrupt_fs
=
true
;
processed
=
false
;
break
;
}
...
...
@@ -325,7 +319,6 @@ fil_name_process(
break
;
}
}
return
(
processed
);
}
/** Parse or process a MLOG_FILE_* record.
...
...
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