Commit f1c8749f authored by Marko Mäkelä's avatar Marko Mäkelä

Fix DBUG_ENTER/return mismatch

Spotted by Thirunarayanan Balathandayuthapani.
parent 8aa37c26
...@@ -1092,7 +1092,7 @@ row_merge_read( ...@@ -1092,7 +1092,7 @@ row_merge_read(
if (success && log_tmp_is_encrypted()) { if (success && log_tmp_is_encrypted()) {
if (!log_tmp_block_decrypt(buf, srv_sort_buf_size, if (!log_tmp_block_decrypt(buf, srv_sort_buf_size,
crypt_buf, ofs)) { crypt_buf, ofs)) {
return (FALSE); DBUG_RETURN(false);
} }
srv_stats.n_merge_blocks_decrypted.inc(); srv_stats.n_merge_blocks_decrypted.inc();
...@@ -1141,7 +1141,7 @@ row_merge_write( ...@@ -1141,7 +1141,7 @@ row_merge_write(
buf_len, buf_len,
static_cast<byte*>(crypt_buf), static_cast<byte*>(crypt_buf),
ofs)) { ofs)) {
return false; DBUG_RETURN(false);
} }
srv_stats.n_merge_blocks_encrypted.inc(); srv_stats.n_merge_blocks_encrypted.inc();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment