database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

After-merge fixes

Browse Source 
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.
This commit is contained in:
Marko Mäkelä
2018-05-30 10:02:43 +03:00
parent 00677b368b
commit c0f9771058
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/btr/btr0sea.cc
View File

@ -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);
}

3
storage/innobase/include/btr0sea.ic
View File

@ -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);

24
unittest/sql/mf_iocache-t.cc
View File

@ -213,14 +213,14 @@ void mdev10259()
res= reinit_io_cache(&info, READ_CACHE, 0, 0, 0);
ok(res == 0, "reinit READ_CACHE" INFO_TAIL);
res= my_b_fill(&info);
ok(res == 200, "fill" INFO_TAIL);
size_t s= my_b_fill(&info);
ok(s == 200, "fill" INFO_TAIL);
res= my_b_fill(&info);
ok(res == 0, "fill" INFO_TAIL);
s= my_b_fill(&info);
ok(s == 0, "fill" INFO_TAIL);
res= my_b_fill(&info);
ok(res == 0, "fill" INFO_TAIL);
s= my_b_fill(&info);
ok(s == 0, "fill" INFO_TAIL);
res= reinit_io_cache(&info, WRITE_CACHE, saved_pos, 0, 0);
ok(res == 0, "reinit WRITE_CACHE" INFO_TAIL);
@ -230,14 +230,14 @@ void mdev10259()
ok(200 == my_b_bytes_in_cache(&info),"my_b_bytes_in_cache == 200");
res= my_b_fill(&info);
ok(res == 0, "fill" INFO_TAIL);
s= my_b_fill(&info);
ok(s == 0, "fill" INFO_TAIL);
res= my_b_fill(&info);
ok(res == 0, "fill" INFO_TAIL);
s= my_b_fill(&info);
ok(s == 0, "fill" INFO_TAIL);
res= my_b_fill(&info);
ok(res == 0, "fill" INFO_TAIL);
s= my_b_fill(&info);
ok(s == 0, "fill" INFO_TAIL);
res= reinit_io_cache(&info, WRITE_CACHE, saved_pos, 0, 0);
ok(res == 0, "reinit WRITE_CACHE" INFO_TAIL);