upmerge bug 17035577 5.1 => 5.5

fafc74e3 · sayantan dutta · 3d658078 · d491e8ae · fafc74e3
Commit fafc74e3 authored Jul 17, 2013 by sayantan dutta
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/lib/v1/mysql-test-run.pl mysql-test/lib/v1/mysql-test-run.pl +1 -1

No files found.
--- a/mysql-test/lib/v1/mysql-test-run.pl
+++ b/mysql-test/lib/v1/mysql-test-run.pl
@@ -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 )