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 /include | |
| 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 'include')
| -rw-r--r-- | include/my_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index c82ecd06627..076eed9998f 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -399,7 +399,7 @@ enum ha_base_keytype { #define HA_STATE_BUFF_SAVED 512 /* If current keybuff is info->buff */ #define HA_STATE_ROW_CHANGED 1024 /* To invalide ROW cache */ #define HA_STATE_EXTEND_BLOCK 2048 -#define HA_STATE_RNEXT_SAME 4096 /* rnext_same was called */ +#define HA_STATE_RNEXT_SAME 4096 /* rnext_same occupied lastkey2 */ /* myisampack expects no more than 32 field types. */ enum en_fieldtype { |