Commit 774056c8 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-11671 Duplicated message for innodb_page_size

Display a NOTE, not a WARNING for non-default page size.
parent 16bc16f9
...@@ -3965,13 +3965,8 @@ innobase_init( ...@@ -3965,13 +3965,8 @@ innobase_init(
any functions that could possibly allocate memory. */ any functions that could possibly allocate memory. */
ut_new_boot(); ut_new_boot();
if (UNIV_PAGE_SIZE != UNIV_PAGE_SIZE_DEF) { /* The buffer pool needs to be able to accommodate enough many
ib::info() << "innodb_page_size has been " pages, even for larger pages */
<< "changed from default value "
<< UNIV_PAGE_SIZE_DEF << " to " << UNIV_PAGE_SIZE;
/* There is hang on buffer pool when trying to get a new
page if buffer pool size is too small for large page sizes */
if (UNIV_PAGE_SIZE > UNIV_PAGE_SIZE_DEF if (UNIV_PAGE_SIZE > UNIV_PAGE_SIZE_DEF
&& innobase_buffer_pool_size < (24 * 1024 * 1024)) { && innobase_buffer_pool_size < (24 * 1024 * 1024)) {
ib::info() << "innodb_page_size=" ib::info() << "innodb_page_size="
...@@ -3980,7 +3975,6 @@ innobase_init( ...@@ -3980,7 +3975,6 @@ innobase_init(
<< innobase_buffer_pool_size; << innobase_buffer_pool_size;
goto error; goto error;
} }
}
#ifndef HAVE_LZ4 #ifndef HAVE_LZ4
if (innodb_compression_algorithm == PAGE_LZ4_ALGORITHM) { if (innodb_compression_algorithm == PAGE_LZ4_ALGORITHM) {
...@@ -4296,9 +4290,7 @@ innobase_init( ...@@ -4296,9 +4290,7 @@ innobase_init(
srv_log_file_size = (ib_uint64_t) innobase_log_file_size; srv_log_file_size = (ib_uint64_t) innobase_log_file_size;
if (UNIV_PAGE_SIZE_DEF != srv_page_size) { if (UNIV_PAGE_SIZE_DEF != srv_page_size) {
ib::warn() << "innodb-page-size has been changed from the" ib::info() << "innodb_page_size=" << srv_page_size;
" default value " << UNIV_PAGE_SIZE_DEF << " to "
<< srv_page_size << ".";
} }
if (srv_log_write_ahead_size > srv_page_size) { if (srv_log_write_ahead_size > srv_page_size) {
......
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