diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-11 11:34:44 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-11 11:34:44 +0200 |
| commit | 6d4224a31c9d32c8f8067a4f7d16daa29bcdee6b (patch) | |
| tree | 79e3143528495069ad232f673532573b30afe425 /storage/maria/ma_write.c | |
| parent | 3e2cb35e11cb5ee6668d538a62a3b32e017944a5 (diff) | |
| parent | 701c0f822abe4ee9eeafd244fa30dc2fcf067b81 (diff) | |
| download | mariadb-git-6d4224a31c9d32c8f8067a4f7d16daa29bcdee6b.tar.gz | |
Merge with 5.2.
no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
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 7b80ca5a5b8..27d1598fd62 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -375,9 +375,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) rw_unlock(&keyinfo->root_lock); @@ -845,7 +847,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)) { /* |