diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-30 10:02:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-30 10:06:29 +0300 |
| commit | c0f977105820dcc9daadf268181561dca9de4483 (patch) | |
| tree | 3f6f34ae116acbdf05690f6e080f409612de2c70 /storage | |
| parent | 00677b368b4075e387d4ce62eb1c51f93bf62e46 (diff) | |
| download | mariadb-git-c0f977105820dcc9daadf268181561dca9de4483.tar.gz | |
After-merge fixes
Fix type mismatches in the unit test mdev10259().
btr_search_info_get_ref_count(): Do not return early if !table->space.
We can simply access table->space_id even after the tablespace has
been discarded.
btr_get_search_latch(): Relax a debug assertion to allow
!index->table->space.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/btr/btr0sea.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/include/btr0sea.ic | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/btr/btr0sea.cc b/storage/innobase/btr/btr0sea.cc index ca4d2e91979..038e262cfad 100644 --- a/storage/innobase/btr/btr0sea.cc +++ b/storage/innobase/btr/btr0sea.cc @@ -431,7 +431,7 @@ btr_search_info_get_ref_count( { ulint ret = 0; - if (!btr_search_enabled || !index->table->space) { + if (!btr_search_enabled) { return(ret); } diff --git a/storage/innobase/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic index c99cb2d8d06..efa3667d229 100644 --- a/storage/innobase/include/btr0sea.ic +++ b/storage/innobase/include/btr0sea.ic @@ -152,7 +152,8 @@ static inline bool btr_search_own_any(ulint mode) static inline rw_lock_t* btr_get_search_latch(const dict_index_t* index) { ut_ad(index != NULL); - ut_ad(index->table->space->id == index->table->space_id); + ut_ad(!index->table->space + || index->table->space->id == index->table->space_id); ulint ifold = ut_fold_ulint_pair(ulint(index->id), index->table->space_id); |