diff options
| author | monty@mashka.mysql.fi <> | 2003-01-09 03:55:26 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-09 03:55:26 +0200 |
| commit | f8e660d88ca64d2f7a1be58acbe57d777d20b122 (patch) | |
| tree | af09adc5a3ec6814545553d72fda1d33e443d162 /myisam/myisamdef.h | |
| parent | a10178493005b3fa69163ef39c6a58fe9ff6658b (diff) | |
| parent | 2ea43f3c53573a6482ea84556e11e5db6cedddef (diff) | |
| download | mariadb-git-f8e660d88ca64d2f7a1be58acbe57d777d20b122.tar.gz | |
merge with 4.0.9
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
Diffstat (limited to 'myisam/myisamdef.h')
| -rw-r--r-- | myisam/myisamdef.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index e5cac1f090e..005c36271bf 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -385,7 +385,7 @@ typedef struct st_mi_sort_param #define MI_DYN_ALIGN_SIZE 4 /* Align blocks on this */ #define MI_MAX_DYN_HEADER_BYTE 13 /* max header byte for dynamic rows */ #define MI_MAX_BLOCK_LENGTH ((((ulong) 1 << 24)-1) & (~ (ulong) (MI_DYN_ALIGN_SIZE-1))) -#define MI_REC_BUFF_OFFSET ALIGN_SIZE(MI_DYN_DELETE_BLOCK_HEADER+sizeof(uint)) +#define MI_REC_BUFF_OFFSET ALIGN_SIZE(MI_DYN_DELETE_BLOCK_HEADER+sizeof(uint32)) #define MEMMAP_EXTRA_MARGIN 7 /* Write this as a suffix for file */ @@ -554,7 +554,7 @@ extern byte *mi_alloc_rec_buff(MI_INFO *,ulong, byte**); ((((info)->s->options & HA_OPTION_PACK_RECORD) && (buf)) ? \ (buf) - MI_REC_BUFF_OFFSET : (buf)) #define mi_get_rec_buff_len(info,buf) \ - (*((uint *)(mi_get_rec_buff_ptr(info,buf)))) + (*((uint32 *)(mi_get_rec_buff_ptr(info,buf)))) extern ulong _mi_rec_unpack(MI_INFO *info,byte *to,byte *from, ulong reclength); |