diff options
| author | Sergey Vojtovich <sergey.vojtovich@oracle.com> | 2011-09-16 16:21:05 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <sergey.vojtovich@oracle.com> | 2011-09-16 16:21:05 +0400 |
| commit | cb9e23bb30319c888b4d6ed37d5560357477e327 (patch) | |
| tree | e25371d1f9776bc70b1e52f886cc9a7b5f9a8c09 /storage | |
| parent | 93f2daf3ad75562a6a173a032668a6e0556684b5 (diff) | |
| parent | 3f9cbd7731fa268575242095cd29d00be2a222f2 (diff) | |
| download | mariadb-git-cb9e23bb30319c888b4d6ed37d5560357477e327.tar.gz | |
Merge.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/ft_boolean_search.c | 2 | ||||
| -rw-r--r-- | storage/myisam/ft_nlq_search.c | 2 | ||||
| -rw-r--r-- | storage/myisam/mi_check.c | 4 | ||||
| -rw-r--r-- | storage/myisam/mi_write.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c index ae32f541dab..43db42c8383 100644 --- a/storage/myisam/ft_boolean_search.c +++ b/storage/myisam/ft_boolean_search.c @@ -360,7 +360,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) int subkeys=1; my_bool can_go_down; MI_INFO *info=ftb->info; - uint UNINIT_VAR(off), extra=HA_FT_WLEN+info->s->base.rec_reflength; + uint UNINIT_VAR(off), extra= HA_FT_WLEN + info->s->rec_reflength; uchar *lastkey_buf=ftbw->word+ftbw->off; if (ftbw->flags & FTB_FLAG_TRUNC) diff --git a/storage/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c index 0dc82fb4c25..175f061f168 100644 --- a/storage/myisam/ft_nlq_search.c +++ b/storage/myisam/ft_nlq_search.c @@ -72,7 +72,7 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) uchar *keybuff=aio->keybuff; MI_KEYDEF *keyinfo=info->s->keyinfo+aio->keynr; my_off_t key_root=info->s->state.key_root[aio->keynr]; - uint extra=HA_FT_WLEN+info->s->base.rec_reflength; + uint extra= HA_FT_WLEN + info->s->rec_reflength; #if HA_FT_WTYPE == HA_KEYTYPE_FLOAT float tmp_weight; #else diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index f4b78939778..d2b0c63cfe9 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -3899,7 +3899,7 @@ static int sort_ft_key_write(MI_SORT_PARAM *sort_param, const void *a) SORT_FT_BUF *ft_buf=sort_info->ft_buf; SORT_KEY_BLOCKS *key_block=sort_info->key_block; - val_len=HA_FT_WLEN+sort_info->info->s->base.rec_reflength; + val_len= HA_FT_WLEN + sort_info->info->s->rec_reflength; get_key_full_length_rdonly(a_len, (uchar *)a); if (!ft_buf) @@ -3909,7 +3909,7 @@ static int sort_ft_key_write(MI_SORT_PARAM *sort_param, const void *a) and row format is NOT static - for _mi_dpointer not to garble offsets */ if ((sort_info->info->s->base.key_reflength <= - sort_info->info->s->base.rec_reflength) && + sort_info->info->s->rec_reflength) && (sort_info->info->s->options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD))) ft_buf=(SORT_FT_BUF *)my_malloc(sort_param->keyinfo->block_length + diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c index 246255395df..b1bbf209e25 100644 --- a/storage/myisam/mi_write.c +++ b/storage/myisam/mi_write.c @@ -519,7 +519,7 @@ int _mi_insert(register MI_INFO *info, register MI_KEYDEF *keyinfo, { if (keyinfo->block_length - a_length < 32 && keyinfo->flag & HA_FULLTEXT && key_pos == endpos && - info->s->base.key_reflength <= info->s->base.rec_reflength && + info->s->base.key_reflength <= info->s->rec_reflength && info->s->options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) { /* |