Skip to content

Commit

Permalink
Fix type truncation warnings.
Browse files Browse the repository at this point in the history
rx_i_s_cache_t is now bool, not ibool.
  • Loading branch information
vaintroub committed Jan 29, 2018
1 parent 8b673d4 commit 28d4124
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions storage/innobase/include/trx0i_s.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ trx_i_s_possibly_fetch_data_into_cache(
trx_i_s_cache_t* cache); /*!< in/out: cache */

/*******************************************************************//**
Returns TRUE if the data in the cache is truncated due to the memory
Returns true, if the data in the cache is truncated due to the memory
limit posed by TRX_I_S_MEM_LIMIT.
@return TRUE if truncated */
ibool
bool
trx_i_s_cache_is_truncated(
/*=======================*/
trx_i_s_cache_t* cache); /*!< in: cache */
Expand Down
10 changes: 5 additions & 5 deletions storage/innobase/trx/trx0i_s.cc
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ struct trx_i_s_cache_t {
lock_sys->mutex or trx_sys.mutex */
ulint mem_allocd; /*!< the amount of memory
allocated with mem_alloc*() */
ibool is_truncated; /*!< this is TRUE if the memory
bool is_truncated; /*!< this is true if the memory
limit was hit and thus the data
in the cache is truncated */
};
Expand Down Expand Up @@ -1271,7 +1271,7 @@ static void fetch_data_into_cache_low(trx_i_s_cache_t *cache, const trx_t *trx)
}

/* memory could not be allocated */
cache->is_truncated= TRUE;
cache->is_truncated= true;
}


Expand Down Expand Up @@ -1321,7 +1321,7 @@ static void fetch_data_into_cache(trx_i_s_cache_t *cache)
}
}
mutex_exit(&trx_sys.mutex);
cache->is_truncated= FALSE;
cache->is_truncated= false;
}


Expand Down Expand Up @@ -1356,7 +1356,7 @@ trx_i_s_possibly_fetch_data_into_cache(
Returns TRUE if the data in the cache is truncated due to the memory
limit posed by TRX_I_S_MEM_LIMIT.
@return TRUE if truncated */
ibool
bool
trx_i_s_cache_is_truncated(
/*=======================*/
trx_i_s_cache_t* cache) /*!< in: cache */
Expand Down Expand Up @@ -1403,7 +1403,7 @@ trx_i_s_cache_init(

cache->mem_allocd = 0;

cache->is_truncated = FALSE;
cache->is_truncated = false;
}

/*******************************************************************//**
Expand Down

0 comments on commit 28d4124

Please sign in to comment.