summaryrefslogtreecommitdiff
path: root/myisam/mi_update.c
diff options
context:
space:
mode:
authoringo@mysql.com <>2006-03-10 15:06:04 +0100
committeringo@mysql.com <>2006-03-10 15:06:04 +0100
commit1173185891c59733dbd9e9d51fb4e0c8a88ddcc7 (patch)
tree69f9a1581fb7f7add78372fcd17b5333622d8377 /myisam/mi_update.c
parent3b3cb95eb9076378b26be48bb80a486c17a04845 (diff)
parentd0c6eb885d7bb3a78bd2261372d7f41164636d40 (diff)
downloadmariadb-git-1173185891c59733dbd9e9d51fb4e0c8a88ddcc7.tar.gz
Merge mysql.com:/home/mydev/mysql-4.1-bug14980
into mysql.com:/home/mydev/mysql-5.0-bug14980
Diffstat (limited to 'myisam/mi_update.c')
-rw-r--r--myisam/mi_update.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/myisam/mi_update.c b/myisam/mi_update.c
index 86652996afe..937c9983b45 100644
--- a/myisam/mi_update.c
+++ b/myisam/mi_update.c
@@ -111,6 +111,10 @@ int mi_update(register MI_INFO *info, const byte *oldrec, byte *newrec)
{
uint new_length=_mi_make_key(info,i,new_key,newrec,pos);
uint old_length=_mi_make_key(info,i,old_key,oldrec,pos);
+
+ /* The above changed info->lastkey2. Inform mi_rnext_same(). */
+ info->update&= ~HA_STATE_RNEXT_SAME;
+
if (new_length != old_length ||
memcmp((byte*) old_key,(byte*) new_key,new_length))
{