diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-21 15:23:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-21 15:23:45 +0300 |
| commit | 32ec5fb979760ba2db52d8afc39e8e090cf80a9c (patch) | |
| tree | 354038721b2f99c9834c31c4a6f3a5fa23c21341 /storage/heap | |
| parent | e8de75db88acdf228237fbebad7f4c8f05e5cc1f (diff) | |
| parent | 9de2e60d7491fcf3cd1f20a4be715ef0bedc316f (diff) | |
| download | mariadb-git-32ec5fb979760ba2db52d8afc39e8e090cf80a9c.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/hp_scan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/heap/hp_scan.c b/storage/heap/hp_scan.c index 3315cb05b3f..f07efe6cf67 100644 --- a/storage/heap/hp_scan.c +++ b/storage/heap/hp_scan.c @@ -50,7 +50,9 @@ int heap_scan(register HP_INFO *info, uchar *record) } else { - info->next_block+=share->block.records_in_block; + /* increase next_block to the next records_in_block boundary */ + ulong rem= info->next_block % share->block.records_in_block; + info->next_block+=share->block.records_in_block - rem; if (info->next_block >= share->records+share->deleted) { info->next_block= share->records+share->deleted; |