database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-05-10 10:01:15 +03:00
parent 35977e81f9 8c73fab7f7
commit 0e1437e147
34 changed files with 2368 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/lib/My/Debugger.pm
View File

@ -147,7 +147,7 @@ sub do_args($$$$$) {
my %vars = (
vardir => $::opt_vardir,
exe => $$exe,
args => join(' ', map { quote_from_mtr $_ } @$$args, '--gdb'),
args => join(' ', map { quote_from_mtr $_ } @$$args, '--loose-gdb'),
input => $input,
script => "$::opt_vardir/tmp/${k}init.$type",
log => "$::opt_vardir/log/$type.$k",
@ -158,7 +158,7 @@ sub do_args($$$$$) {
my $script = join "\n", @params;
if ($v->{script}) {
::mtr_tofile($vars{script}, subst($v->{script}, %vars)."\n".$script);
::mtr_tonewfile($vars{script}, subst($v->{script}, %vars)."\n".$script);
} elsif ($script) {
die "$k is not using a script file, nowhere to write the script \n---\n$script\n---\n";
}