Skip to content

M
mariadb
Commit c4af2a25 authored by Michael Widenius's avatar Michael Widenius
Browse files
Options

Automerge with 5.1

parents 58a75bb1 1aa3b02c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
mysql-test/suite/maria/r/maria3.result
View file @ c4af2a25
...@@ -312,12 +312,12 @@ maria_log_file_size 4294959104 ...@@ -312,12 +312,12 @@ maria_log_file_size 4294959104
maria_log_purge_type immediate maria_log_purge_type immediate
maria_max_sort_file_size 9223372036853727232 maria_max_sort_file_size 9223372036853727232
maria_pagecache_age_threshold 300 maria_pagecache_age_threshold 300
maria_pagecache_buffer_size 8384512 maria_pagecache_buffer_size 134213632
maria_pagecache_division_limit 100 maria_pagecache_division_limit 100
maria_page_checksum OFF maria_page_checksum OFF
maria_recover NORMAL maria_recover NORMAL
maria_repair_threads 1 maria_repair_threads 1
maria_sort_buffer_size 8388608 maria_sort_buffer_size 134217728
maria_stats_method nulls_unequal maria_stats_method nulls_unequal
maria_sync_log_dir NEWFILE maria_sync_log_dir NEWFILE
show status like 'maria%'; show status like 'maria%';
......
storage/maria/maria_def.h
View file @ c4af2a25
...@@ -1083,7 +1083,7 @@ typedef struct st_maria_block_info ...@@ -1083,7 +1083,7 @@ typedef struct st_maria_block_info
#define USE_BUFFER_INIT (((1024L*1024L*128-MALLOC_OVERHEAD)/8192)*8192) #define USE_BUFFER_INIT (((1024L*1024L*128-MALLOC_OVERHEAD)/8192)*8192)
#define READ_BUFFER_INIT (1024L*256L-MALLOC_OVERHEAD) #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 MIN_SORT_BUFFER (4096-MALLOC_OVERHEAD)
#define fast_ma_writeinfo(INFO) if (!(INFO)->s->tot_locks) (void) _ma_writeinfo((INFO),0) #define fast_ma_writeinfo(INFO) if (!(INFO)->s->tot_locks) (void) _ma_writeinfo((INFO),0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7