diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-18 16:27:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-18 16:27:26 +0200 |
| commit | 44be8652c567ccaa0067830fa327cbffbe66b4cd (patch) | |
| tree | 402568fe80203487dc6e4380b9257cf6b15874a3 /storage | |
| parent | fb4a897fd97c07c493449a17fa56aa462ca30eb9 (diff) | |
| download | mariadb-git-44be8652c567ccaa0067830fa327cbffbe66b4cd.tar.gz | |
Cleanup: Remove fil_space_get_flags()
Replace fil_space_get_flags(space) == ULINT_UNDEFINED
with the functionally equivalent fil_space_get_size(space) == 0.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 31 | ||||
| -rw-r--r-- | storage/innobase/include/fil0fil.h | 8 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 6 |
3 files changed, 2 insertions, 43 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 75f11b0ece4..859c49c0d15 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -1469,37 +1469,6 @@ fil_space_get_size( return(size); } -/*******************************************************************//** -Returns the flags of the space. The tablespace must be cached -in the memory cache. -@return flags, ULINT_UNDEFINED if space not found */ -ulint -fil_space_get_flags( -/*================*/ - ulint id) /*!< in: space id */ -{ - fil_space_t* space; - ulint flags; - - ut_ad(fil_system.is_initialised()); - - mutex_enter(&fil_system.mutex); - - space = fil_space_get_space(id); - - if (space == NULL) { - mutex_exit(&fil_system.mutex); - - return(ULINT_UNDEFINED); - } - - flags = space->flags; - - mutex_exit(&fil_system.mutex); - - return(flags); -} - /** Open each file. Only invoked on fil_system.temp_space. @return whether all files were opened */ bool fil_space_t::open() diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 3cf695c66b0..c2deef8a2c0 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1073,14 +1073,6 @@ ulint fil_space_get_size( /*===============*/ ulint id); /*!< in: space id */ -/*******************************************************************//** -Returns the flags of the space. The tablespace must be cached -in the memory cache. -@return flags, ULINT_UNDEFINED if space not found */ -ulint -fil_space_get_flags( -/*================*/ - ulint id); /*!< in: space id */ /*******************************************************************//** Opens all log files and system tablespace data files. They stay open until the diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index e77910af743..afce73f5524 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -2633,8 +2633,7 @@ loop: case STORE_NO: break; case STORE_IF_EXISTS: - if (fil_space_get_flags(space) - == ULINT_UNDEFINED) { + if (!fil_space_get_size(space)) { break; } /* fall through */ @@ -2810,8 +2809,7 @@ corrupted_log: case STORE_NO: break; case STORE_IF_EXISTS: - if (fil_space_get_flags(space) - == ULINT_UNDEFINED) { + if (!fil_space_get_size(space)) { break; } /* fall through */ |