summaryrefslogtreecommitdiff
path: root/storage/myisam/mi_preload.c
diff options
context:
space:
mode:
authortulin@dl145b.mysql.com <>2005-07-19 21:56:10 +0200
committertulin@dl145b.mysql.com <>2005-07-19 21:56:10 +0200
commita6c21a079163d2d09163cb4084ada38f4ddac929 (patch)
tree91e9f17b6b183df5ad37be93a13365d7d0f0d7f8 /storage/myisam/mi_preload.c
parent519c5564b15cf4b88719eb0e4cb4dc5247891425 (diff)
parente3af1b6ec6ecd95b6f42192c75af08fcc7c3618a (diff)
downloadmariadb-git-a6c21a079163d2d09163cb4084ada38f4ddac929.tar.gz
merge
Diffstat (limited to 'storage/myisam/mi_preload.c')
-rw-r--r--storage/myisam/mi_preload.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_preload.c b/storage/myisam/mi_preload.c
index 317ab4ad7fe..d63399b519d 100644
--- a/storage/myisam/mi_preload.c
+++ b/storage/myisam/mi_preload.c
@@ -51,7 +51,7 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
my_off_t pos= share->base.keystart;
DBUG_ENTER("mi_preload");
- if (!keys || !key_map || key_file_length == pos)
+ if (!keys || !mi_is_any_key_active(key_map) || key_file_length == pos)
DBUG_RETURN(0);
block_length= keyinfo[0].block_length;