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 /unittest | |
| 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 'unittest')
| -rw-r--r-- | unittest/sql/mf_iocache-t.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/unittest/sql/mf_iocache-t.cc b/unittest/sql/mf_iocache-t.cc index b94b4ef0905..dbb16e51c70 100644 --- a/unittest/sql/mf_iocache-t.cc +++ b/unittest/sql/mf_iocache-t.cc @@ -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); |