From db1adb2234fd99ad600e494bf09ab373106ccd87 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Mon, 18 Sep 2006 19:38:59 +0200 Subject: [PATCH] Fix merge error, path_mysock has been renamed to path_sock --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 92d902910bd..566dee2f62e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1537,7 +1537,7 @@ sub environment_setup () { my $cmdline_mysql= "$exe_mysql --no-defaults --host=localhost --user=root --password= " . "--port=$master->[0]->{'port'} " . - "--socket=$master->[0]->{'path_mysock'} ". + "--socket=$master->[0]->{'path_sock'} ". "--character-sets-dir=$path_charsetsdir"; $ENV{'MYSQL'}= $cmdline_mysql;