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

MDEV-11671: Duplicated [NOTE] output for changed innodb_page_size

Browse Source 
Remove duplicated output and change output level to info.
This commit is contained in:
Jan Lindström 2017-01-31 15:42:52 +02:00
parent 41997d148d
commit 17cc619847
2 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
storage/innobase/handler/ha_innodb.cc
View File

@ -3448,22 +3448,16 @@ innobase_init(
}
}
if (UNIV_PAGE_SIZE != UNIV_PAGE_SIZE_DEF) {
/* The buffer pool needs to be able to accommodate enough many
pages, even for larger pages */
if (UNIV_PAGE_SIZE > UNIV_PAGE_SIZE_DEF
&& innobase_buffer_pool_size < (24 * 1024 * 1024)) {
ib_logf(IB_LOG_LEVEL_INFO,
"innodb_page_size has been "
"changed from default value %d to %ld.",
UNIV_PAGE_SIZE_DEF, 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
&& innobase_buffer_pool_size < (24 * 1024 * 1024)) {
ib_logf(IB_LOG_LEVEL_ERROR,
"innodb_page_size=%lu requires "
"innodb_buffer_pool_size > 24M current %lld",
UNIV_PAGE_SIZE, innobase_buffer_pool_size);
goto error;
}
"innodb_page_size= " ULINTPF " requires "
"innodb_buffer_pool_size > 24M current %lld. ",
UNIV_PAGE_SIZE,
innobase_buffer_pool_size);
goto error;
}
#ifndef HAVE_LZ4
@ -3764,11 +3758,11 @@ innobase_change_buffering_inited_ok:
srv_page_size);
goto mem_free_and_error;
}
if (UNIV_PAGE_SIZE_DEF != srv_page_size) {
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: innodb-page-size has been changed"
" from the default value %d to %lu.\n",
ib_logf(IB_LOG_LEVEL_INFO,
" innodb-page-size has been changed"
" from the default value %d to " ULINTPF ".",
UNIV_PAGE_SIZE_DEF, srv_page_size);
}

33
storage/xtradb/handler/ha_innodb.cc
View File

@ -3865,23 +3865,16 @@ innobase_init(
srv_log_block_size = 512;
}
if (UNIV_PAGE_SIZE != UNIV_PAGE_SIZE_DEF) {
/* The buffer pool needs to be able to accommodate enough many
pages, even for larger pages */
if (UNIV_PAGE_SIZE > UNIV_PAGE_SIZE_DEF
&& innobase_buffer_pool_size < (24 * 1024 * 1024)) {
ib_logf(IB_LOG_LEVEL_INFO,
"innodb_page_size has been "
"changed from default value %d to %ld.",
UNIV_PAGE_SIZE_DEF, 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
&& innobase_buffer_pool_size < (24 * 1024 * 1024)) {
ib_logf(IB_LOG_LEVEL_ERROR,
"innodb_page_size=%lu requires "
"innodb_buffer_pool_size > 24M current %lld",
UNIV_PAGE_SIZE, innobase_buffer_pool_size);
goto error;
}
"innodb_page_size= " ULINTPF " requires "
"innodb_buffer_pool_size > 24M current %lld. ",
UNIV_PAGE_SIZE,
innobase_buffer_pool_size);
goto error;
}
ut_ad (srv_log_block_size >= OS_MIN_LOG_BLOCK_SIZE);
@ -4204,11 +4197,11 @@ innobase_change_buffering_inited_ok:
srv_page_size);
goto mem_free_and_error;
}
if (UNIV_PAGE_SIZE_DEF != srv_page_size) {
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: innodb-page-size has been changed"
" from the default value %d to %lu.\n",
ib_logf(IB_LOG_LEVEL_INFO,
" innodb-page-size has been changed"
" from the default value %d to " ULINTPF " .",
UNIV_PAGE_SIZE_DEF, srv_page_size);
}