1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fil_name_process(): Remove unused return value

Browse Source
This commit is contained in:
Marko Mäkelä 2018-08-23 17:02:50 +03:00
parent 9a815401c6
commit c164d0cc62
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/innobase/log/log0recv.cc
View File

@ -194,11 +194,9 @@ void (*log_file_op)(ulint space_id, const byte* flags,
@param[in,out] name file name @param[in,out] name file name
@param[in] len length of the file name @param[in] len length of the file name
@param[in] space_id the tablespace ID @param[in] space_id the tablespace ID
@param[in] deleted whether this is a MLOG_FILE_DELETE record @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 */
static static
bool void
fil_name_process( fil_name_process(
char* name, char* name,
ulint len, ulint len,
@ -206,15 +204,13 @@ fil_name_process(
bool deleted) bool deleted)
{ {
if (srv_operation == SRV_OPERATION_BACKUP) { if (srv_operation == SRV_OPERATION_BACKUP) {
return true; return;
} }
ut_ad(srv_operation == SRV_OPERATION_NORMAL ut_ad(srv_operation == SRV_OPERATION_NORMAL
|| srv_operation == SRV_OPERATION_RESTORE || srv_operation == SRV_OPERATION_RESTORE
|| srv_operation == SRV_OPERATION_RESTORE_EXPORT); || srv_operation == SRV_OPERATION_RESTORE_EXPORT);
bool processed = true;
/* We will also insert space=NULL into the map, so that /* We will also insert space=NULL into the map, so that
further checks can ensure that a MLOG_FILE_NAME record was further checks can ensure that a MLOG_FILE_NAME record was
scanned before applying any page records for the space_id. */ scanned before applying any page records for the space_id. */
@ -261,7 +257,6 @@ fil_name_process(
<< f.name << "' and '" << name << "'." << f.name << "' and '" << name << "'."
" You must delete one of them."; " You must delete one of them.";
recv_sys->found_corrupt_fs = true; recv_sys->found_corrupt_fs = true;
processed = false;
} }
break; break;
@ -314,7 +309,6 @@ fil_name_process(
" remove the .ibd file, you can set" " remove the .ibd file, you can set"
" --innodb_force_recovery."; " --innodb_force_recovery.";
recv_sys->found_corrupt_fs = true; recv_sys->found_corrupt_fs = true;
processed = false;
break; break;
} }
@ -325,7 +319,6 @@ fil_name_process(
break; break;
} }
} }
return(processed);
} }
/** Parse or process a MLOG_FILE_* record. /** Parse or process a MLOG_FILE_* record.