Merge shellback.(none):/home/msvensson/mysql/work/my50-work

into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
781aaaba · msvensson@shellback.(none) · ad1c1592 · dafb5005 · 781aaaba
Commit 781aaaba authored Sep 18, 2006 by msvensson@shellback.(none)
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +2 -1

No files found.
--- 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 " .