diff options
| author | unknown <istruewing@chilla.local> | 2007-03-08 19:23:36 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-08 19:23:36 +0100 |
| commit | 86589331ce139d6ff02d648933d92f04c7ad6cfc (patch) | |
| tree | ae908a1e35c86feb8b82452409574cb3e0ba3e21 /myisam | |
| parent | 2157f642380a766d4d859997b624a8cd0bfc7e80 (diff) | |
| parent | 35d5819129fb86378a2c5ff6fa268f97befbe09b (diff) | |
| download | mariadb-git-86589331ce139d6ff02d648933d92f04c7ad6cfc.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug25673
into chilla.local:/home/mydev/mysql-5.0-bug25673
myisam/rt_index.c:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/rt_index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/rt_index.c b/myisam/rt_index.c index 66e7a698df9..2927730b68f 100644 --- a/myisam/rt_index.c +++ b/myisam/rt_index.c @@ -634,14 +634,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, |