summaryrefslogtreecommitdiff
path: root/heap
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2006-08-09 22:23:41 -0400
committercmiller@zippy.cornsilk.net <>2006-08-09 22:23:41 -0400
commit543fcde9b9ba65ebb061606e95dbe6eb8710db16 (patch)
treed69877217b5d46b9f37fd63c1e665f2c8e6d2648 /heap
parent5f3d231f5706d43572a1f90873db6ee98226bfcb (diff)
parent5fc215e2e322b1c8223ba0c7b996bef2f8e07db8 (diff)
downloadmariadb-git-543fcde9b9ba65ebb061606e95dbe6eb8710db16.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
Diffstat (limited to 'heap')
-rw-r--r--heap/hp_delete.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/heap/hp_delete.c b/heap/hp_delete.c
index f37db2588f3..f18c5e7054c 100644
--- a/heap/hp_delete.c
+++ b/heap/hp_delete.c
@@ -73,7 +73,10 @@ int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo,
int res;
if (flag)
+ {
info->last_pos= NULL; /* For heap_rnext/heap_rprev */
+ info->lastkey_len= 0;
+ }
custom_arg.keyseg= keyinfo->seg;
custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos);