Skip to content

Commit 774056c

Browse files
committed
MDEV-11671 Duplicated message for innodb_page_size
Display a NOTE, not a WARNING for non-default page size.
1 parent 16bc16f commit 774056c

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

storage/innobase/handler/ha_innodb.cc

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3965,21 +3965,15 @@ innobase_init(
39653965
any functions that could possibly allocate memory. */
39663966
ut_new_boot();
39673967

3968-
if (UNIV_PAGE_SIZE != UNIV_PAGE_SIZE_DEF) {
3969-
ib::info() << "innodb_page_size has been "
3970-
<< "changed from default value "
3971-
<< UNIV_PAGE_SIZE_DEF << " to " << UNIV_PAGE_SIZE;
3972-
3973-
/* There is hang on buffer pool when trying to get a new
3974-
page if buffer pool size is too small for large page sizes */
3975-
if (UNIV_PAGE_SIZE > UNIV_PAGE_SIZE_DEF
3976-
&& innobase_buffer_pool_size < (24 * 1024 * 1024)) {
3977-
ib::info() << "innodb_page_size="
3978-
<< UNIV_PAGE_SIZE << " requires "
3979-
<< "innodb_buffer_pool_size > 24M current "
3980-
<< innobase_buffer_pool_size;
3981-
goto error;
3982-
}
3968+
/* The buffer pool needs to be able to accommodate enough many
3969+
pages, even for larger pages */
3970+
if (UNIV_PAGE_SIZE > UNIV_PAGE_SIZE_DEF
3971+
&& innobase_buffer_pool_size < (24 * 1024 * 1024)) {
3972+
ib::info() << "innodb_page_size="
3973+
<< UNIV_PAGE_SIZE << " requires "
3974+
<< "innodb_buffer_pool_size > 24M current "
3975+
<< innobase_buffer_pool_size;
3976+
goto error;
39833977
}
39843978

39853979
#ifndef HAVE_LZ4
@@ -4296,9 +4290,7 @@ innobase_init(
42964290
srv_log_file_size = (ib_uint64_t) innobase_log_file_size;
42974291

42984292
if (UNIV_PAGE_SIZE_DEF != srv_page_size) {
4299-
ib::warn() << "innodb-page-size has been changed from the"
4300-
" default value " << UNIV_PAGE_SIZE_DEF << " to "
4301-
<< srv_page_size << ".";
4293+
ib::info() << "innodb_page_size=" << srv_page_size;
43024294
}
43034295

43044296
if (srv_log_write_ahead_size > srv_page_size) {

0 commit comments

Comments
 (0)