summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <istruewing@chilla.local>2007-03-08 19:22:43 +0100
committerunknown <istruewing@chilla.local>2007-03-08 19:22:43 +0100
commit35d5819129fb86378a2c5ff6fa268f97befbe09b (patch)
treec731dd2ae04ea0e9f3178e164208aad22efe9027 /myisam
parent548a39a104e7abeff3b3429938085b25d2a28c70 (diff)
downloadmariadb-git-35d5819129fb86378a2c5ff6fa268f97befbe09b.tar.gz
Bug#25673 - spatial index corruption, error 126 incorrect key file for table
After backport fix. Added forgotten DBUG_RETURNs, which was detected in 5.1 only.
Diffstat (limited to 'myisam')
-rw-r--r--myisam/rt_index.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/rt_index.c b/myisam/rt_index.c
index 9c58f4ba5d2..fd988f320ff 100644
--- a/myisam/rt_index.c
+++ b/myisam/rt_index.c
@@ -636,14 +636,14 @@ static int rtree_insert_level(MI_INFO *info, uint keynr, uchar *key,
int res;
if ((old_root = _mi_new(info, keyinfo, DFLT_INIT_HITS)) == HA_OFFSET_ERROR)
- return -1;
+ DBUG_RETURN(-1);
info->buff_used = 1;
mi_putint(info->buff, 2, 0);
res = rtree_add_key(info, keyinfo, key, key_length, info->buff, NULL);
if (_mi_write_keypage(info, keyinfo, old_root, DFLT_INIT_HITS, info->buff))
- return 1;
+ DBUG_RETURN(1);
info->s->state.key_root[keynr] = old_root;
- return res;
+ DBUG_RETURN(res);
}
switch ((res = rtree_insert_req(info, keyinfo, key, key_length,