1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automerge with 5.1

Browse Source
This commit is contained in:
Michael Widenius 2010-08-25 01:47:52 +03:00
commit c4af2a255e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/maria/r/maria3.result
View File

@ -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%';

2
storage/maria/maria_def.h
View File

@ -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)