diff options
| author | baker@bk-internal.mysql.com <> | 2007-03-23 20:25:36 +0100 |
|---|---|---|
| committer | baker@bk-internal.mysql.com <> | 2007-03-23 20:25:36 +0100 |
| commit | 503d7b20cb2d28e1feb53ded79f37d939eda48a6 (patch) | |
| tree | 2c6a17e6d18b5ef4016c3f0025c046ca0c0b2861 /mysql-test/mysql-test-run.pl | |
| parent | 5e0596f4e1e8a30139b3bab62095a2d301d7970c (diff) | |
| parent | 2527b6ba1b34fad88e646226fd4deb1aba52beac (diff) | |
| download | mariadb-git-503d7b20cb2d28e1feb53ded79f37d939eda48a6.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2bc9ea66fc8..b0c89e08d03 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1885,8 +1885,7 @@ sub environment_setup () { mtr_native_path($exe_mysqlslap) . " -uroot " . "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_sock'} --password= " . - "--lock-directory=$opt_tmpdir"; + "--socket=$master->[0]->{'path_sock'} --password= "; if ( $opt_debug ) { |