summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-01-24 02:26:29 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-01-24 02:26:29 +0100
commitb1422b8f1b2e93de2ec548c81df5609dd5996515 (patch)
treec537df86cc253f88be2625506d0b81751ae5458a
parentb7cf6abe521160a9b9a905df3bdfe134f1336d39 (diff)
downloadmariadb-git-b1422b8f1b2e93de2ec548c81df5609dd5996515.tar.gz
reduce diffs to the 5.5 version, remove random change in mysql-test-run.pl
-rwxr-xr-xmysql-test/mysql-test-run.pl4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 0b088391236..1bef01e3bd5 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3495,9 +3495,7 @@ sub mysql_install_db {
mtr_add_arg($args, "--loose-skip-ndbcluster");
mtr_add_arg($args, "--loose-skip-aria");
mtr_add_arg($args, "--disable-sync-frm");
- mtr_add_arg($args, "--tmpdir=.");
- mtr_add_arg($args, "--max_allowed_packet=8M");
- mtr_add_arg($args, "--net_buffer_length=16K");
+ mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/");
mtr_add_arg($args, "--core-file");
if ( $opt_debug )