summaryrefslogtreecommitdiff
path: root/myisam/mi_delete.c
diff options
context:
space:
mode:
authorunknown <ingo@mysql.com>2006-03-10 15:06:04 +0100
committerunknown <ingo@mysql.com>2006-03-10 15:06:04 +0100
commit95408957080ff8f96868fae49418bdfd8b252ff8 (patch)
tree69f9a1581fb7f7add78372fcd17b5333622d8377 /myisam/mi_delete.c
parent8947b79999b2d4c40d234e0ae8bd2a6ff53ba6f3 (diff)
parentd8b4d419961eb2c818e09a920a38c4edcae0dd3a (diff)
downloadmariadb-git-95408957080ff8f96868fae49418bdfd8b252ff8.tar.gz
Merge mysql.com:/home/mydev/mysql-4.1-bug14980
into mysql.com:/home/mydev/mysql-5.0-bug14980 include/my_base.h: Auto merged myisam/mi_delete.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_rnext_same.c: Auto merged myisam/mi_unique.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged mysql-test/r/myisam.result: SCCS merged mysql-test/t/myisam.test: SCCS merged
Diffstat (limited to 'myisam/mi_delete.c')
-rw-r--r--myisam/mi_delete.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c
index 2010b684300..2bc99d65dd2 100644
--- a/myisam/mi_delete.c
+++ b/myisam/mi_delete.c
@@ -88,6 +88,8 @@ int mi_delete(MI_INFO *info,const byte *record)
_mi_make_key(info,i,old_key,record,info->lastpos)))
goto err;
}
+ /* The above changed info->lastkey2. Inform mi_rnext_same(). */
+ info->update&= ~HA_STATE_RNEXT_SAME;
}
}