diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-12-14 15:33:01 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-12-14 15:33:01 +0100 |
| commit | 6f1f388942ab806abc83bf46c535c42180fee074 (patch) | |
| tree | 4adb688db824badb3db784673d38d1ae5e61621a /storage/myisam | |
| parent | 88721f0274790d3321b2d792889793c760d43310 (diff) | |
| parent | 336c57f9cee3bb8eeb60e37628ea6687289560f5 (diff) | |
| download | mariadb-git-6f1f388942ab806abc83bf46c535c42180fee074.tar.gz | |
merged bug#12361113.
Also added tests for partitions key caches.
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_preload.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/myisam/mi_preload.c b/storage/myisam/mi_preload.c index 01b740cc564..a0187ec7f99 100644 --- a/storage/myisam/mi_preload.c +++ b/storage/myisam/mi_preload.c @@ -53,6 +53,9 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves) if (!keys || !mi_is_any_key_active(key_map) || key_file_length == pos) DBUG_RETURN(0); + /* Preload into a non initialized key cache should never happen. */ + DBUG_ASSERT(share->key_cache->key_cache_inited); + block_length= keyinfo[0].block_length; if (ignore_leaves) |