mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/work/my51-work
This commit is contained in:
@ -1541,7 +1541,8 @@ sub environment_setup () {
|
||||
my $cmdline_mysql=
|
||||
"$exe_mysql --no-defaults --host=localhost --user=root --password= " .
|
||||
"--port=$master->[0]->{'port'} " .
|
||||
"--socket=$master->[0]->{'path_sock'}";
|
||||
"--socket=$master->[0]->{'path_mysock'} ".
|
||||
"--character-sets-dir=$path_charsetsdir";
|
||||
|
||||
$ENV{'MYSQL'}= $cmdline_mysql;
|
||||
|
||||
@ -3722,7 +3723,6 @@ sub run_check_testcase ($$) {
|
||||
|
||||
sub run_mysqltest ($) {
|
||||
my ($tinfo)= @_;
|
||||
|
||||
my $exe= $exe_mysqltest;
|
||||
my $args;
|
||||
|
||||
|
Reference in New Issue
Block a user