1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-19212: After-merge fix for sizeof(ulong)!=sizeof(ulint)

Browse Source
This commit is contained in:
Marko Mäkelä 2019-04-08 21:53:30 +03:00
parent ee7a4f4462
commit 937ec3c48d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/innobase/buf/buf0buf.cc
View File

@ -1568,12 +1568,12 @@ buf_chunk_init(
/* Round down to a multiple of page size,
although it already should be. */
mem_size = ut_2pow_round(mem_size, ulint(srv_page_size));
mem_size = ut_2pow_round<ulint>(mem_size, srv_page_size);
/* Reserve space for the block descriptors. */
mem_size += ut_2pow_round((mem_size >> srv_page_size_shift)
* (sizeof *block)
+ (srv_page_size - 1),
ulint(srv_page_size));
mem_size += ut_2pow_round<ulint>((mem_size >> srv_page_size_shift)
* (sizeof *block)
+ (srv_page_size - 1),
srv_page_size);
DBUG_EXECUTE_IF("ib_buf_chunk_init_fails", return(NULL););

4
storage/innobase/log/log0log.cc
View File

@ -897,8 +897,8 @@ log_buffer_switch()
ut_ad(log_write_mutex_own());
const byte* old_buf = log_sys.buf;
ulint area_end = ut_calc_align(
log_sys.buf_free, ulint(OS_FILE_LOG_BLOCK_SIZE));
ulong area_end = ut_calc_align(
log_sys.buf_free, ulong(OS_FILE_LOG_BLOCK_SIZE));
if (log_sys.first_in_use) {
log_sys.first_in_use = false;