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

Avoid sign mismatch in comparisons

This is follow-up to commit 1bd98154.
parent 1bd98154
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc. Copyright (c) 2008, Google Inc.
Copyright (c) 2017, 2018, MariaDB Corporation. Copyright (c) 2017, 2019, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described Google, Inc. Those modifications are gratefully acknowledged and are described
...@@ -80,7 +80,7 @@ btr_search_sys_t* btr_search_sys; ...@@ -80,7 +80,7 @@ btr_search_sys_t* btr_search_sys;
/** If the number of records on the page divided by this parameter /** If the number of records on the page divided by this parameter
would have been successfully accessed using a hash index, the index would have been successfully accessed using a hash index, the index
is then built on the page, assuming the global limit has been reached */ is then built on the page, assuming the global limit has been reached */
#define BTR_SEARCH_PAGE_BUILD_LIMIT 16 #define BTR_SEARCH_PAGE_BUILD_LIMIT 16U
/** The global limit for consecutive potentially successful hash searches, /** The global limit for consecutive potentially successful hash searches,
before hash index building is started */ before hash index building is started */
...@@ -570,7 +570,7 @@ btr_search_update_block_hash_info( ...@@ -570,7 +570,7 @@ btr_search_update_block_hash_info(
if ((!block->index) if ((!block->index)
|| (block->n_hash_helps || (block->n_hash_helps
> 2 * page_get_n_recs(block->frame)) > 2U * page_get_n_recs(block->frame))
|| (block->n_fields != block->curr_n_fields) || (block->n_fields != block->curr_n_fields)
|| (block->n_bytes != block->curr_n_bytes) || (block->n_bytes != block->curr_n_bytes)
|| (block->left_side != block->curr_left_side)) { || (block->left_side != block->curr_left_side)) {
......
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