diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-03-09 19:04:59 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-03-09 19:04:59 -0800 |
| commit | e6578a345c807987cc6e7fb4e9504f03b36dfa00 (patch) | |
| tree | 9e0b57c6d0cea4a77c23dc87356e09a524eb268d /storage/myisam/mi_preload.c | |
| parent | 6c1aab92d25580643595962ae61a963a3e2fbd9d (diff) | |
| parent | f92cfdb8a9ff7f8287239c39ce4735789a23e3df (diff) | |
| download | mariadb-git-e6578a345c807987cc6e7fb4e9504f03b36dfa00.tar.gz | |
Merged 5.3 changes into the mwl #248 tree.
Diffstat (limited to 'storage/myisam/mi_preload.c')
| -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 a2d751a709c..fad89215f35 100644 --- a/storage/myisam/mi_preload.c +++ b/storage/myisam/mi_preload.c @@ -56,6 +56,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) |