diff options
author | sayantan dutta <sayantan.dutta@oracle.com> | 2013-07-17 14:25:09 +0530 |
---|---|---|
committer | sayantan dutta <sayantan.dutta@oracle.com> | 2013-07-17 14:25:09 +0530 |
commit | 010bcf8ddf37da99df4daf58a9547b7fcff5b7ab (patch) | |
tree | 5ba18535bc3b7672c60f073dc87ef63fb3370298 /mysql-test/lib | |
parent | 5d95304c0541695b968023a359c4198fd7dc7d97 (diff) | |
parent | c088c9c4c5f84b7f9f0b1d8bc49d1fce89317c88 (diff) | |
download | mariadb-git-010bcf8ddf37da99df4daf58a9547b7fcff5b7ab.tar.gz |
upmerge bug 17035577 5.1 => 5.5
Diffstat (limited to 'mysql-test/lib')
-rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 791e5c450da..b18c3c18553 100755 --- 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 ) |