summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-22 13:50:53 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-22 13:50:53 +0300
commite52a36d37be2fa8a2da8a987cb38cb0bb65233f4 (patch)
tree74c5190f9aca07e75f5951f64d48e882f2ce7aea /storage
parent8760ba652188f1f409f3a57b58fc0ce6e25ea6ea (diff)
parentad4b70562bb94dd063eebde5189c6e730d3120a2 (diff)
downloadmariadb-git-e52a36d37be2fa8a2da8a987cb38cb0bb65233f4.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'storage')
-rw-r--r--storage/maria/ma_pagecrc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_pagecrc.c b/storage/maria/ma_pagecrc.c
index b0c02e60929..4d73ced3b11 100644
--- a/storage/maria/ma_pagecrc.c
+++ b/storage/maria/ma_pagecrc.c
@@ -251,7 +251,8 @@ my_bool maria_page_crc_check_index(int res, PAGECACHE_IO_HOOK_ARGS *args)
if (length > share->block_size - CRC_SIZE)
{
DBUG_PRINT("error", ("Wrong page length: %u", length));
- return (my_errno= HA_ERR_WRONG_CRC);
+ my_errno= HA_ERR_WRONG_CRC;
+ return 1;
}
return maria_page_crc_check(page, (uint32) page_no, share,
MARIA_NO_CRC_NORMAL_PAGE,