mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fix merge error, path_mysock has been renamed to path_sock
This commit is contained in:
@ -1537,7 +1537,7 @@ sub environment_setup () {
|
|||||||
my $cmdline_mysql=
|
my $cmdline_mysql=
|
||||||
"$exe_mysql --no-defaults --host=localhost --user=root --password= " .
|
"$exe_mysql --no-defaults --host=localhost --user=root --password= " .
|
||||||
"--port=$master->[0]->{'port'} " .
|
"--port=$master->[0]->{'port'} " .
|
||||||
"--socket=$master->[0]->{'path_mysock'} ".
|
"--socket=$master->[0]->{'path_sock'} ".
|
||||||
"--character-sets-dir=$path_charsetsdir";
|
"--character-sets-dir=$path_charsetsdir";
|
||||||
|
|
||||||
$ENV{'MYSQL'}= $cmdline_mysql;
|
$ENV{'MYSQL'}= $cmdline_mysql;
|
||||||
|
Reference in New Issue
Block a user