summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <istruewing@chilla.local>2007-03-09 16:40:30 +0100
committerunknown <istruewing@chilla.local>2007-03-09 16:40:30 +0100
commit35a0dc2fd179b5f52c10a3c913ab54c807ed16b4 (patch)
tree95d5c2a3386dde5ebaccd446e3036bdafef35b1e /myisam
parent86589331ce139d6ff02d648933d92f04c7ad6cfc (diff)
parent603a3981729f366fc0ce113ebdc2f485eff72a92 (diff)
downloadmariadb-git-35a0dc2fd179b5f52c10a3c913ab54c807ed16b4.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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/rt_index.c b/myisam/rt_index.c
index 2927730b68f..4c52f730406 100644
--- a/myisam/rt_index.c
+++ b/myisam/rt_index.c
@@ -976,7 +976,7 @@ int rtree_delete(MI_INFO *info, uint keynr, uchar *key, uint key_length)
}
if (res)
{
- int j;
+ ulong j;
DBUG_PRINT("rtree", ("root has been split, adjust levels"));
for (j= i; j < ReinsertList.n_pages; j++)
{