diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /storage/maria/ma_write.c | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'storage/maria/ma_write.c')
| -rw-r--r-- | storage/maria/ma_write.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index 95cc1203..9a6859bf 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -428,14 +428,15 @@ err2: my_bool _ma_ck_write(MARIA_HA *info, MARIA_KEY *key) { + my_bool tmp; DBUG_ENTER("_ma_ck_write"); if (info->bulk_insert && is_tree_inited(&info->bulk_insert[key->keyinfo->key_nr])) - { - DBUG_RETURN(_ma_ck_write_tree(info, key)); - } - DBUG_RETURN(_ma_ck_write_btree(info, key)); + tmp= _ma_ck_write_tree(info, key); + else + tmp= _ma_ck_write_btree(info, key); + DBUG_RETURN(tmp); } /* _ma_ck_write */ |