diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-01 19:04:08 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-01 19:04:08 +0500 |
| commit | 602343262f4d83ad587619e0cd6db92fa2b3c183 (patch) | |
| tree | 13ae127f22a5783757a4ddfb2f98e6c33948360e /myisam | |
| parent | da9f990b5480645014f982fe5c2b1880ce54b314 (diff) | |
| parent | 01fe277cc6e0863ca03ab11d1f12bd9b52dc180e (diff) | |
| download | mariadb-git-602343262f4d83ad587619e0cd6db92fa2b3c183.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into mysql.com:/home/hf/work/21888/my41-21888
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_range.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/myisam/mi_range.c b/myisam/mi_range.c index 1e0fd42334e..de042845d1e 100644 --- a/myisam/mi_range.c +++ b/myisam/mi_range.c @@ -71,6 +71,21 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, key_range *min_key, uchar * key_buff; uint start_key_len; + /* + The problem is that the optimizer doesn't support + RTree keys properly at the moment. + Hope this will be fixed some day. + But now NULL in the min_key means that we + didn't make the task for the RTree key + and expect BTree functionality from it. + As it's not able to handle such request + we return the error. + */ + if (!min_key) + { + res= HA_POS_ERROR; + break; + } key_buff= info->lastkey+info->s->base.max_key_length; start_key_len= _mi_pack_key(info,inx, key_buff, (uchar*) min_key->key, min_key->length, |