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

Fix some -Wsign-conversion

parent 1292a01c
...@@ -192,7 +192,7 @@ ha_clear( ...@@ -192,7 +192,7 @@ ha_clear(
#ifdef BTR_CUR_HASH_ADAPT #ifdef BTR_CUR_HASH_ADAPT
# if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG # if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
/** Maximum number of records in a page */ /** Maximum number of records in a page */
static const lint MAX_N_POINTERS static const ulint MAX_N_POINTERS
= UNIV_PAGE_SIZE_MAX / REC_N_NEW_EXTRA_BYTES; = UNIV_PAGE_SIZE_MAX / REC_N_NEW_EXTRA_BYTES;
# endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ # endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
...@@ -242,8 +242,8 @@ ha_insert_for_fold_func( ...@@ -242,8 +242,8 @@ ha_insert_for_fold_func(
buf_block_t* prev_block = prev_node->block; buf_block_t* prev_block = prev_node->block;
ut_a(prev_block->frame ut_a(prev_block->frame
== page_align(prev_node->data)); == page_align(prev_node->data));
ut_a(my_atomic_addlint( ut_a(my_atomic_addlint(&prev_block->n_pointers,
&prev_block->n_pointers, -1) ulint(-1))
< MAX_N_POINTERS); < MAX_N_POINTERS);
ut_a(my_atomic_addlint(&block->n_pointers, 1) ut_a(my_atomic_addlint(&block->n_pointers, 1)
< MAX_N_POINTERS); < MAX_N_POINTERS);
...@@ -339,7 +339,7 @@ ha_delete_hash_node( ...@@ -339,7 +339,7 @@ ha_delete_hash_node(
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
if (table->adaptive) { if (table->adaptive) {
ut_a(del_node->block->frame = page_align(del_node->data)); ut_a(del_node->block->frame = page_align(del_node->data));
ut_a(my_atomic_addlint(&del_node->block->n_pointers, -1) ut_a(my_atomic_addlint(&del_node->block->n_pointers, ulint(-1))
< MAX_N_POINTERS); < MAX_N_POINTERS);
} }
#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
...@@ -382,7 +382,8 @@ ha_search_and_update_if_found_func( ...@@ -382,7 +382,8 @@ ha_search_and_update_if_found_func(
if (node) { if (node) {
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
if (table->adaptive) { if (table->adaptive) {
ut_a(my_atomic_addlint(&node->block->n_pointers, -1) ut_a(my_atomic_addlint(&node->block->n_pointers,
ulint(-1))
< MAX_N_POINTERS); < MAX_N_POINTERS);
ut_a(my_atomic_addlint(&new_block->n_pointers, 1) ut_a(my_atomic_addlint(&new_block->n_pointers, 1)
< MAX_N_POINTERS); < MAX_N_POINTERS);
......
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