diff options
| author | unknown <ingo@mysql.com> | 2006-03-10 17:52:28 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-03-10 17:52:28 +0100 |
| commit | b63e25d55d0c949efed4f451492357fe4b1d3386 (patch) | |
| tree | ce85c7c3ed6125d7d5bbe1cdf0c9d301fcb539f6 /include/my_base.h | |
| parent | 54715b8bb69a0b212557a3542ae12b38a1fca120 (diff) | |
| parent | cefb1dc2743ee50c83f075897a9e0b3c4f303b68 (diff) | |
| download | mariadb-git-b63e25d55d0c949efed4f451492357fe4b1d3386.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0-bug14980
into mysql.com:/home/mydev/mysql-5.1-bug14980
include/my_base.h:
Auto merged
mysql-test/r/myisam.result:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_rnext_same.c:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
Diffstat (limited to 'include/my_base.h')
| -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 9f0b90e894e..a704ff1b6ab 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -423,7 +423,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 { |