Skip to content

Commit 6fc5c0a

Browse files
Dyre TjeldvollDyre Tjeldvoll
Dyre Tjeldvoll
authored and
Dyre Tjeldvoll
committed
Bug#26989949: make main.basedir work with renamed binary
Problem: main.basedir did not work with renamed binaries (mysqld-debug) Solution: Fix perl-regexps so that they do not hard code the name of the binary. Change-Id: I7c03864e207b70fed313a432ef5f4718200b8522
1 parent a02f9c1 commit 6fc5c0a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

mysql-test/t/basedir.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ EOF
9292
$ENV{'PATH'}="$bindir:$ENV{'PATH'}";
9393

9494
my $init_file_args= $ENV{'INIT_FILE_ARGS'};
95-
(system("mysqld $init_file_args") == 0) ||
95+
my $binary= $ENV{'MYSQLD'};
96+
$binary =~ s|$bdir/||;
97+
(system("$binary $init_file_args") == 0) ||
9698
die "system failed on 'mysqld $init_file_args': $!";
9799

98100
my $mysqld_log= $ENV{'MYSQLD_LOG'};

0 commit comments

Comments
 (0)