5.5 merge

This commit is contained in:
Sergei Golubchik 2013-11-23 00:50:54 +01:00
commit c6d30805db
1275 changed files with 66336 additions and 40622 deletions

View file

@ -4144,7 +4144,7 @@ sub mysqld_arguments ($$$$) {
}
mtr_add_arg($args, "%s--key_buffer_size=1M", $prefix);
mtr_add_arg($args, "%s--sort_buffer=256K", $prefix);
mtr_add_arg($args, "%s--sort_buffer_size=256K", $prefix);
mtr_add_arg($args, "%s--max_heap_table_size=1M", $prefix);
if ( $opt_ssl_supported )