From dafb50055f67ed90111d96dd1db4cf4d16bde5af Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Mon, 18 Sep 2006 17:46:36 +0200
Subject: [PATCH] Add character-sets-dir argument to "mysql". That avoids a
 local installed charset dir being used.

---
 mysql-test/mysql-test-run.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 7bca21e3ff6..49ffd8fb02f 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2901,7 +2901,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 " .