upmerge bug 17035577 5.1 => 5.5

This commit is contained in:
sayantan dutta 2013-07-17 14:25:09 +05:30
commit 010bcf8ddf

View File

@ -4056,7 +4056,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 )