mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
Fix merge error, path_mysock has been renamed to path_sock
This commit is contained in:
parent
7dabd8c683
commit
db1adb2234
1 changed files with 1 additions and 1 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue