#At lp:maria/5.2 based on revid:monty@askmonty.org-20100824224450-uy4luc80dk5y67fq 2848 Michael Widenius 2010-08-25 [merge] Automerge with 5.1 modified: mysql-test/suite/maria/r/maria3.result storage/maria/maria_def.h === modified file 'mysql-test/suite/maria/r/maria3.result' --- a/mysql-test/suite/maria/r/maria3.result 2010-06-16 10:58:56 +0000 +++ b/mysql-test/suite/maria/r/maria3.result 2010-08-24 22:47:52 +0000 @@ -312,12 +312,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%'; === modified file 'storage/maria/maria_def.h' --- a/storage/maria/maria_def.h 2010-08-24 17:17:17 +0000 +++ b/storage/maria/maria_def.h 2010-08-24 22:18:01 +0000 @@ -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)