From: Date: March 8 2007 7:22pm Subject: bk commit into 4.1 tree (istruewing:1.2608) BUG#25673 List-Archive: http://lists.mysql.com/commits/21533 X-Bug: 25673 Message-Id: Below is the list of changes that have just been committed into a local 4.1 repository of istruewing. When istruewing does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-03-08 19:22:43+01:00, istruewing@stripped +1 -0 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. myisam/rt_index.c@stripped, 2007-03-08 19:22:41+01:00, istruewing@stripped +3 -3 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. # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: istruewing # Host: chilla.local # Root: /home/mydev/mysql-4.1-bug25673 --- 1.18/myisam/rt_index.c 2007-03-08 19:22:46 +01:00 +++ 1.19/myisam/rt_index.c 2007-03-08 19:22:46 +01:00 @@ -636,14 +636,14 @@ static int rtree_insert_level(MI_INFO *i 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,