diff options
Diffstat (limited to 'storage/maria/ma_write.c')
| -rw-r--r-- | storage/maria/ma_write.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index 60693d2173a..c6d7ed9ea84 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -373,9 +373,11 @@ err: else { MARIA_KEY key; - if (_ma_ck_delete(info, - (*keyinfo->make_key)(info, &key, i, buff, record, - filepos, info->trn->trid))) + if (keyinfo->ck_delete(info, + (*keyinfo->make_key)(info, &key, i, buff, + record, + filepos, + info->trn->trid))) { if (local_lock_tree) mysql_rwlock_unlock(&keyinfo->root_lock); @@ -842,7 +844,7 @@ int _ma_insert(register MARIA_HA *info, MARIA_KEY *key, { if (share->max_index_block_size - a_length < 32 && (keyinfo->flag & HA_FULLTEXT) && key_pos == endpos && - share->base.key_reflength <= share->base.rec_reflength && + share->base.key_reflength <= share->rec_reflength && share->options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) { /* |