summaryrefslogtreecommitdiff
path: root/myisam/rt_index.c
diff options
context:
space:
mode:
authoristruewing@chilla.local <>2007-03-08 19:22:43 +0100
committeristruewing@chilla.local <>2007-03-08 19:22:43 +0100
commit90f23116e226eb842588cb8f639ac8ed52aa29d7 (patch)
treec731dd2ae04ea0e9f3178e164208aad22efe9027 /myisam/rt_index.c
parent2d6ad76abd1948f977da202258a463a6d888bf3c (diff)
downloadmariadb-git-90f23116e226eb842588cb8f639ac8ed52aa29d7.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/rt_index.c')
-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,