diff options
Diffstat (limited to 'storage/innobase/fil/fil0fil.cc')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 596c6bdfdb0..26e0593b266 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -185,7 +185,7 @@ fil_is_user_tablespace_id( ulint space_id) { return(space_id > srv_undo_tablespaces_open - && space_id != srv_tmp_space.space_id()); + && space_id != SRV_TMP_SPACE_ID); } #ifdef UNIV_DEBUG @@ -1313,7 +1313,7 @@ fil_space_create( /* This warning is not applicable while MEB scanning the redo logs */ #ifndef UNIV_HOTBACKUP - if (fil_type_is_data(purpose) + if ((purpose == FIL_TYPE_TABLESPACE || purpose == FIL_TYPE_IMPORT) && !recv_recovery_on && id > fil_system->max_assigned_id) { @@ -5104,10 +5104,13 @@ retry: ulint pages_per_mb = (1024 * 1024) / page_size; ulint size_in_pages = ((node->size / pages_per_mb) * pages_per_mb); - if (space->id == srv_sys_space.space_id()) { + switch (space->id) { + case TRX_SYS_SPACE: srv_sys_space.set_last_file_size(size_in_pages); - } else if (space->id == srv_tmp_space.space_id()) { + break; + case SRV_TMP_SPACE_ID: srv_tmp_space.set_last_file_size(size_in_pages); + break; } #else ib::trace() << "extended space : " << space->name << " from " |