diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-13 11:11:20 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-13 11:11:20 -0400 |
| commit | 3ff8200ac17fda202b2adc0a4f7a2bb91c8078d0 (patch) | |
| tree | abade15123a2fd253ad9ebc948ac5aeeaacd3181 /mysql-test/mysql-test-run.pl | |
| parent | a7dddd3b67e70292c0813e80ad255f1dc2f3a867 (diff) | |
| parent | 4823bc50413d11a1f8329db9cde5bc5173d365c8 (diff) | |
| download | mariadb-git-3ff8200ac17fda202b2adc0a4f7a2bb91c8078d0.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
tests/mysql_client_test.c:
manual merge
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 14bd9b198a2..91a9a758d1d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3074,6 +3074,7 @@ sub run_mysqltest ($) { my $cmdline_mysql_client_test= "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " . "--port=$master->[0]->{'path_myport'} " . + "--vardir=$opt_vardir " . "--socket=$master->[0]->{'path_mysock'}"; if ( $glob_use_embedded_server ) |