|
|
@ -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.
|
|
|
|