summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-01-12 01:48:34 +0200
committerMichael Widenius <monty@askmonty.org>2011-01-12 01:48:34 +0200
commit713999a4fe628fb89b81de50a4e87c44273f2c33 (patch)
treec7f5ab3c3c78b6fbc674df65f2f9bfd56299fb06
parenta008186f1d219a87e05dfb19c644cbcd8d589051 (diff)
downloadmariadb-git-713999a4fe628fb89b81de50a4e87c44273f2c33.tar.gz
Allow one to decrease page-buffer-size down to 1M (from 128M) for maria_read_log
Don't allow too low value of pagecache_buffer_size for mysqld storage/maria/ha_maria.cc: Don't allow too low value of pagecache_buffer_size (as it will stop mysqld from starting) storage/maria/maria_read_log.c: Allow one to decrease page-buffer-size down to 1M (from 128M)
-rw-r--r--storage/maria/ha_maria.cc2
-rw-r--r--storage/maria/maria_read_log.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 467b065513d..6a7d7cf50ea 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -191,7 +191,7 @@ static MYSQL_SYSVAR_ULONGLONG(pagecache_buffer_size, pagecache_buffer_size,
"The size of the buffer used for index blocks for Maria tables. "
"Increase this to get better index handling (for all reads and "
"multiple writes) to as much as you can afford.", 0, 0,
- KEY_CACHE_SIZE, MALLOC_OVERHEAD, ~(ulong) 0, IO_SIZE);
+ KEY_CACHE_SIZE, 8192*16L, ~(ulong) 0, IO_SIZE);
static MYSQL_SYSVAR_ULONG(pagecache_division_limit, pagecache_division_limit,
PLUGIN_VAR_RQCMDARG,
diff --git a/storage/maria/maria_read_log.c b/storage/maria/maria_read_log.c
index 69b4e7e9fbc..89f3e82e2aa 100644
--- a/storage/maria/maria_read_log.c
+++ b/storage/maria/maria_read_log.c
@@ -199,7 +199,8 @@ static struct my_option my_long_options[] =
"Path to the directory where to store transactional log",
(uchar **) &maria_data_root, (uchar **) &maria_data_root, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
- { "page-buffer-size", 'P', "",
+ { "page-buffer-size", 'P',
+ "The size of the buffer used for index blocks for Maria tables",
&opt_page_buffer_size, &opt_page_buffer_size, 0,
GET_ULONG, REQUIRED_ARG, (long) USE_BUFFER_INIT,
1024L*1024L, (long) ~(ulong) 0, (long) MALLOC_OVERHEAD,