From a2a2e32c02643a0cec111511220227703fda1cd5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2024 20:15:00 +0200 Subject: Merging upstream version 1:11.4.2. Signed-off-by: Daniel Baumann --- storage/maria/ma_write.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'storage/maria/ma_write.c') 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 */ -- cgit v1.2.3