summaryrefslogtreecommitdiff
path: root/storage/innobase/buf
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 21:38:13 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 21:38:13 +0300
commit9ba0865b875c8b11a3ca26c9ee17635961d18b23 (patch)
tree8d33042f9b00bbd5d6894d93607de62649c6c7a2 /storage/innobase/buf
parentcc492bfd4ff2d15cc5803a7d80f1559ceeb003c1 (diff)
parent7362f115543d34b1d3f06e61be9235b30c0abc8a (diff)
downloadmariadb-git-9ba0865b875c8b11a3ca26c9ee17635961d18b23.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/buf')
-rw-r--r--storage/innobase/buf/buf0buf.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 2d5c0ddc3ca..81eeba2b1ad 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -1606,7 +1606,7 @@ buf_chunk_init(
chunk->blocks = (buf_block_t*) chunk->mem;
/* Align a pointer to the first frame. Note that when
- os_large_page_size is smaller than srv_page_size,
+ opt_large_page_size is smaller than srv_page_size,
we may allocate one fewer block than requested. When
it is bigger, we may allocate more blocks than requested. */