diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-25 15:58:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-25 15:58:16 +0300 |
| commit | f1c8749f46f2479b9298195a7799f44ce1529757 (patch) | |
| tree | 1a5407ef076f112032d54c0f085569101ea9e299 | |
| parent | 8aa37c264f1c67beb9dc5cd4127379f0e596e3f5 (diff) | |
| download | mariadb-git-f1c8749f46f2479b9298195a7799f44ce1529757.tar.gz | |
Fix DBUG_ENTER/return mismatch
Spotted by Thirunarayanan Balathandayuthapani.
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index cb2f10b5546..31e323d423c 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -1092,7 +1092,7 @@ row_merge_read( if (success && log_tmp_is_encrypted()) { if (!log_tmp_block_decrypt(buf, srv_sort_buf_size, crypt_buf, ofs)) { - return (FALSE); + DBUG_RETURN(false); } srv_stats.n_merge_blocks_decrypted.inc(); @@ -1141,7 +1141,7 @@ row_merge_write( buf_len, static_cast<byte*>(crypt_buf), ofs)) { - return false; + DBUG_RETURN(false); } srv_stats.n_merge_blocks_encrypted.inc(); |