diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-13 17:05:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-13 17:05:13 +0300 |
| commit | af27f17ea1d7ed3e7381293fdb7f3945518a0243 (patch) | |
| tree | 0690f8240b9c2daedc45f17e56cf1285061a6b37 /storage/myisam | |
| parent | 272620399425a1b59f6565ff130970bca6d9b4f9 (diff) | |
| parent | de20872331d18d804db8c2df677288659444af1b (diff) | |
| download | mariadb-git-af27f17ea1d7ed3e7381293fdb7f3945518a0243.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_key.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c index ff07920caa8..ed72acf627e 100644 --- a/storage/myisam/mi_key.c +++ b/storage/myisam/mi_key.c @@ -563,7 +563,15 @@ check_result_t mi_check_index_tuple(MI_INFO *info, uint keynr, uchar *record) if (need_unpack && mi_unpack_index_tuple(info, keynr, record)) res= CHECK_ERROR; else - res= info->rowid_filter_func(info->rowid_filter_func_arg); + { + if ((res= info->rowid_filter_func(info->rowid_filter_func_arg)) == + CHECK_OUT_OF_RANGE) + { + /* We got beyond the end of scanned range */ + info->lastpos= HA_OFFSET_ERROR; /* No active record */ + my_errno= HA_ERR_END_OF_FILE; + } + } } return res; } |