diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-08 21:53:30 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-08 21:54:38 +0300 |
| commit | 937ec3c48d2068dfb76d47cb409eb19d38677da1 (patch) | |
| tree | 5fe3ee3127e7e858c383a53a4e7cf41e27114ace | |
| parent | ee7a4f4462e312d7aca81eb96e81224905741acd (diff) | |
| download | mariadb-git-937ec3c48d2068dfb76d47cb409eb19d38677da1.tar.gz | |
MDEV-19212: After-merge fix for sizeof(ulong)!=sizeof(ulint)
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 10 | ||||
| -rw-r--r-- | storage/innobase/log/log0log.cc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 81eeba2b1ad..b709fe643fa 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -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);); diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 8a80d2bbfd4..0ffbe7bf327 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -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; |