summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-08-23 17:02:50 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-08-23 17:02:50 +0300
commitc164d0cc6226db586ca62a10b925439ca8fdf086 (patch)
treeae3c3ed8b27a8415187d0fb97862ae1396b40fb3
parent9a815401c6c1972745432ff93cbc8f55cae30d0f (diff)
downloadmariadb-git-c164d0cc6226db586ca62a10b925439ca8fdf086.tar.gz
fil_name_process(): Remove unused return value
-rw-r--r--storage/innobase/log/log0recv.cc13
1 files changed, 3 insertions, 10 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index c623b884628..86c415599bb 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -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.