diff options
| author | unknown <ingo@mysql.com> | 2006-03-10 15:06:04 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-03-10 15:06:04 +0100 |
| commit | cefb1dc2743ee50c83f075897a9e0b3c4f303b68 (patch) | |
| tree | 69f9a1581fb7f7add78372fcd17b5333622d8377 /myisam/mi_update.c | |
| parent | cf539a5ac0420bb15d9eed06998510be4bb46598 (diff) | |
| parent | fbe17c2a36dcaa99c5a6570f7096745126113301 (diff) | |
| download | mariadb-git-cefb1dc2743ee50c83f075897a9e0b3c4f303b68.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_update.c')
| -rw-r--r-- | myisam/mi_update.c | 4 |
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)) { |