File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -438,10 +438,7 @@ Datafile::validate_for_recovery()
438
438
}
439
439
440
440
if (restore_from_doublewrite ()) {
441
- if (m_defer) {
442
- return err;
443
- }
444
- return (DB_CORRUPTION);
441
+ return m_defer ? err : DB_CORRUPTION;
445
442
}
446
443
447
444
/* Free the previously read first page and then re-validate. */
Original file line number Diff line number Diff line change @@ -797,7 +797,10 @@ static struct
797
797
return space;
798
798
}
799
799
800
- /* Recover the page0 of deferred tablespace from doublewrite buffer.*/
800
+ /* * Attempt to recover pages from the doublewrite buffer.
801
+ This is invoked if we found neither a valid first page in the
802
+ data file nor redo log records that would initialize the first
803
+ page. */
801
804
void deferred_dblwr ()
802
805
{
803
806
for (auto d= defers.begin (); d != defers.end (); )
@@ -832,10 +835,10 @@ static struct
832
835
space->free_limit = fsp_header_get_field (page, FSP_FREE_LIMIT);
833
836
space->free_len = flst_get_len (FSP_HEADER_OFFSET + FSP_FREE + page);
834
837
fil_node_t *node= UT_LIST_GET_FIRST (space->chain );
835
- if (!space->acquire ())
838
+ if (!space->acquire ())
836
839
goto next_item;
837
840
if (os_file_write (IORequestWrite, node->name , node->handle ,
838
- page, 0 , fil_space_t::physical_size (flags) !=
841
+ page, 0 , fil_space_t::physical_size (flags) !=
839
842
DB_SUCCESS))
840
843
{
841
844
space->release ();
You can’t perform that action at this time.
0 commit comments