Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
17cc6198
Commit
17cc6198
authored
Jan 31, 2017
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-11671: Duplicated [NOTE] output for changed innodb_page_size
Remove duplicated output and change output level to info.
parent
41997d14
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
39 deletions
+26
-39
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+13
-19
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+13
-20
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
17cc6198
...
@@ -3448,22 +3448,16 @@ innobase_init(
...
@@ -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
,
ib_logf
(
IB_LOG_LEVEL_INFO
,
"innodb_page_size has been "
"innodb_page_size= "
ULINTPF
" requires "
"changed from default value %d to %ld."
,
"innodb_buffer_pool_size > 24M current %lld. "
,
UNIV_PAGE_SIZE_DEF
,
UNIV_PAGE_SIZE
);
UNIV_PAGE_SIZE
,
innobase_buffer_pool_size
);
/* There is hang on buffer pool when trying to get a new
goto
error
;
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
;
}
}
}
#ifndef HAVE_LZ4
#ifndef HAVE_LZ4
...
@@ -3764,11 +3758,11 @@ innobase_init(
...
@@ -3764,11 +3758,11 @@ innobase_init(
srv_page_size
);
srv_page_size
);
goto
mem_free_and_error
;
goto
mem_free_and_error
;
}
}
if
(
UNIV_PAGE_SIZE_DEF
!=
srv_page_size
)
{
if
(
UNIV_PAGE_SIZE_DEF
!=
srv_page_size
)
{
ut_print_timestamp
(
stderr
);
ib_logf
(
IB_LOG_LEVEL_INFO
,
fprintf
(
stderr
,
" innodb-page-size has been changed"
" InnoDB: innodb-page-size has been changed"
" from the default value %d to "
ULINTPF
"."
,
" from the default value %d to %lu.
\n
"
,
UNIV_PAGE_SIZE_DEF
,
srv_page_size
);
UNIV_PAGE_SIZE_DEF
,
srv_page_size
);
}
}
...
...
storage/xtradb/handler/ha_innodb.cc
View file @
17cc6198
...
@@ -3865,23 +3865,16 @@ innobase_init(
...
@@ -3865,23 +3865,16 @@ innobase_init(
srv_log_block_size
=
512
;
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
,
ib_logf
(
IB_LOG_LEVEL_INFO
,
"innodb_page_size has been "
"innodb_page_size= "
ULINTPF
" requires "
"changed from default value %d to %ld."
,
"innodb_buffer_pool_size > 24M current %lld. "
,
UNIV_PAGE_SIZE_DEF
,
UNIV_PAGE_SIZE
);
UNIV_PAGE_SIZE
,
innobase_buffer_pool_size
);
/* There is hang on buffer pool when trying to get a new
goto
error
;
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
;
}
}
}
ut_ad
(
srv_log_block_size
>=
OS_MIN_LOG_BLOCK_SIZE
);
ut_ad
(
srv_log_block_size
>=
OS_MIN_LOG_BLOCK_SIZE
);
...
@@ -4204,11 +4197,11 @@ innobase_init(
...
@@ -4204,11 +4197,11 @@ innobase_init(
srv_page_size
);
srv_page_size
);
goto
mem_free_and_error
;
goto
mem_free_and_error
;
}
}
if
(
UNIV_PAGE_SIZE_DEF
!=
srv_page_size
)
{
if
(
UNIV_PAGE_SIZE_DEF
!=
srv_page_size
)
{
ut_print_timestamp
(
stderr
);
ib_logf
(
IB_LOG_LEVEL_INFO
,
fprintf
(
stderr
,
" innodb-page-size has been changed"
" InnoDB: innodb-page-size has been changed"
" from the default value %d to "
ULINTPF
" ."
,
" from the default value %d to %lu.
\n
"
,
UNIV_PAGE_SIZE_DEF
,
srv_page_size
);
UNIV_PAGE_SIZE_DEF
,
srv_page_size
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment