diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-08-06 16:47:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-08-06 16:47:39 +0200 |
| commit | fbcae42c2ab3d34d46eaf86a636722155b6eb2da (patch) | |
| tree | 19d0450e13bd1057a1f077ecd06815a0a07a9f16 /storage/xtradb | |
| parent | dc716da4571465af3adadcd2c471f11fef3a2191 (diff) | |
| parent | c0ac310e3e0a19cb13da907193f4caad83f095aa (diff) | |
| download | mariadb-git-fbcae42c2ab3d34d46eaf86a636722155b6eb2da.tar.gz | |
Merge branch '10.1' into 10.2mariadb-10.2.33
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/mtr/mtr0mtr.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/xtradb/mtr/mtr0mtr.cc b/storage/xtradb/mtr/mtr0mtr.cc index a04f9cc84a3..ce1002a00f0 100644 --- a/storage/xtradb/mtr/mtr0mtr.cc +++ b/storage/xtradb/mtr/mtr0mtr.cc @@ -93,8 +93,7 @@ mtr_memo_slot_release_func( { fil_space_t* space = reinterpret_cast<fil_space_t*>( static_cast<char*>(object) - - reinterpret_cast<char*>( - &static_cast<fil_space_t*>(0)->latch)); + - my_offsetof(fil_space_t, latch)); space->committed_size = space->size; rw_lock_x_unlock(&space->latch); } |