diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/r/maria3.result index e632363346d..f7cc08bfd0d 100644 --- a/mysql-test/suite/maria/r/maria3.result +++ b/mysql-test/suite/maria/r/maria3.result @@ -310,12 +310,12 @@ maria_log_file_size 4294959104 maria_log_purge_type immediate maria_max_sort_file_size 9223372036853727232 maria_pagecache_age_threshold 300 -maria_pagecache_buffer_size 8384512 +maria_pagecache_buffer_size 134213632 maria_pagecache_division_limit 100 maria_page_checksum OFF maria_recover NORMAL maria_repair_threads 1 -maria_sort_buffer_size 8388608 +maria_sort_buffer_size 134217728 maria_stats_method nulls_unequal maria_sync_log_dir NEWFILE show status like 'maria%'; diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index ae840467894..7b491bc5310 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -370,7 +370,7 @@ static struct my_option my_long_options[] = { "page_buffer_size", OPT_PAGE_BUFFER_SIZE, "Size of page buffer. Used by --safe-repair", &check_param.use_buffers, &check_param.use_buffers, 0, - GET_ULONG, REQUIRED_ARG, (long) USE_BUFFER_INIT, 1024L*1024L, + GET_ULONG, REQUIRED_ARG, (long) USE_BUFFER_INIT, 128L*1024L*1024L, (long) ~0L, (long) MALLOC_OVERHEAD, (long) IO_SIZE, 0}, { "read_buffer_size", OPT_READ_BUFFER_SIZE, "", &check_param.read_buffer_length, diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h index bde04186931..f1454502bb1 100644 --- a/storage/maria/maria_def.h +++ b/storage/maria/maria_def.h @@ -1083,7 +1083,7 @@ typedef struct st_maria_block_info #define USE_BUFFER_INIT (((1024L*1024L*128-MALLOC_OVERHEAD)/8192)*8192) #define READ_BUFFER_INIT (1024L*256L-MALLOC_OVERHEAD) -#define SORT_BUFFER_INIT (1024L*1024L*64-MALLOC_OVERHEAD) +#define SORT_BUFFER_INIT (1024L*1024L*256-MALLOC_OVERHEAD) #define MIN_SORT_BUFFER (4096-MALLOC_OVERHEAD) #define fast_ma_writeinfo(INFO) if (!(INFO)->s->tot_locks) (void) _ma_writeinfo((INFO),0)