diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-18 17:47:26 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-18 17:47:26 +0200 |
| commit | cbafa0c6bc9a4b9ef8bedc096c21e555c463e4ad (patch) | |
| tree | 30758acc50e54b2563aa41be6191b9e36c931c71 /mysql-test/mysql-test-run.pl | |
| parent | 3bbe813a1429ea1d7df628ebd0337bf40f94bc2a (diff) | |
| parent | a5576da753b561b3bcddb3dac8040baf7bf3d882 (diff) | |
| download | mariadb-git-cbafa0c6bc9a4b9ef8bedc096c21e555c463e4ad.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f0eb7f3bda4..ef1a7acb54a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2897,7 +2897,8 @@ sub run_mysqltest ($) { my $cmdline_mysql= "$exe_mysql --host=localhost --user=root --password= " . "--port=$master->[0]->{'path_myport'} " . - "--socket=$master->[0]->{'path_mysock'}"; + "--socket=$master->[0]->{'path_mysock'} ". + "--character-sets-dir=$path_charsetsdir"; my $cmdline_mysql_client_test= "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " . |