Commit 781aaaba authored by msvensson@shellback.(none)'s avatar msvensson@shellback.(none)

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
parents ad1c1592 dafb5005
...@@ -2897,7 +2897,8 @@ sub run_mysqltest ($) { ...@@ -2897,7 +2897,8 @@ sub run_mysqltest ($) {
my $cmdline_mysql= my $cmdline_mysql=
"$exe_mysql --host=localhost --user=root --password= " . "$exe_mysql --host=localhost --user=root --password= " .
"--port=$master->[0]->{'path_myport'} " . "--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= my $cmdline_mysql_client_test=
"$exe_mysql_client_test --no-defaults --testcase --user=root --silent " . "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " .
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment