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
774056c8
Commit
774056c8
authored
Jan 31, 2017
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-11671 Duplicated message for innodb_page_size
Display a NOTE, not a WARNING for non-default page size.
parent
16bc16f9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
18 deletions
+10
-18
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+10
-18
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
774056c8
...
@@ -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
)
{
...
...
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