diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-19 13:16:25 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-19 13:16:25 +0100 |
| commit | fa3f8a18b247d5d7d86d60d016681cc188522f80 (patch) | |
| tree | 180232f5e13c81e22ae9374b41be168ed9578932 /mysql-test/lib/v1 | |
| parent | efab095c7f8f044525ce7d2313fad5f86032baab (diff) | |
| parent | 543b6e02246db25d8a61574fc709b28e7720d1a0 (diff) | |
| download | mariadb-git-fa3f8a18b247d5d7d86d60d016681cc188522f80.tar.gz | |
mysql-5.5.34 merge
(some patches reverted, test case added)
Diffstat (limited to 'mysql-test/lib/v1')
| -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 d63583b1634..109e580a2b3 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -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 ) |