diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-01-26 22:14:43 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-01-26 22:14:43 +0100 |
| commit | 45f7a939149e457403935db8c6b131baf6193f36 (patch) | |
| tree | fb7de471e84140c5711392025fe02e82e49e24cf /storage/myisam | |
| parent | 9aa2ada9d007a41d4e58447ea405b646c4d53ea3 (diff) | |
| download | mariadb-git-45f7a939149e457403935db8c6b131baf6193f36.tar.gz | |
Putting back some fixes lost in a colleague's merge a while back; that was
about problems when the R-tree index is not the first index.
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/rt_index.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/rt_index.c b/storage/myisam/rt_index.c index b1375d99bd0..822983b718c 100644 --- a/storage/myisam/rt_index.c +++ b/storage/myisam/rt_index.c @@ -378,6 +378,7 @@ err1: int rtree_get_first(MI_INFO *info, uint keynr, uint key_length) { my_off_t root; + MI_KEYDEF *keyinfo = info->s->keyinfo + keynr; if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR) { @@ -388,7 +389,7 @@ int rtree_get_first(MI_INFO *info, uint keynr, uint key_length) info->rtree_recursion_depth = -1; info->buff_used = 1; - return rtree_get_req(info, info->s->keyinfo, key_length, root, 0); + return rtree_get_req(info, keyinfo, key_length, root, 0); } |