diff options
Diffstat (limited to 'storage/innobase/include/page0zip.ic')
| -rw-r--r-- | storage/innobase/include/page0zip.ic | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/innobase/include/page0zip.ic b/storage/innobase/include/page0zip.ic index 9cc54dc42fa..5f754e1f993 100644 --- a/storage/innobase/include/page0zip.ic +++ b/storage/innobase/include/page0zip.ic @@ -2,6 +2,7 @@ Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. +Copyright (c) 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -133,11 +134,11 @@ page_zip_set_size( ulint size) /*!< in: size in bytes */ { if (size) { - int ssize; + unsigned ssize; ut_ad(ut_is_2pow(size)); - for (ssize = 1; size > (ulint) (512 << ssize); ssize++) { + for (ssize = 1; size > (512U << ssize); ssize++) { } page_zip->ssize = ssize; @@ -268,9 +269,9 @@ page_zip_max_ins_size( trailer_len += PAGE_ZIP_DIR_SLOT_SIZE; - return((lint) page_zip_get_size(page_zip) - - trailer_len - page_zip->m_end - - (REC_N_NEW_EXTRA_BYTES - 2)); + return(lint(page_zip_get_size(page_zip) + - trailer_len - page_zip->m_end + - (REC_N_NEW_EXTRA_BYTES - 2))); } /**********************************************************************//** |