database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.11' into 11.0

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-08 21:03:46 +02:00
parent f2b4972bd4 036df5f970
commit 51f9d62005
870 changed files with 11721 additions and 6311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,19 +119,19 @@ for my $k (sort keys %debuggers) {
my $v = $debuggers{$k};
$v = $debuggers{$k} = $debuggers{$v} if not ref $v; # resolve aliases
sub register_opt($$) {
my ($name, $msg) = @_;
$opts{"$name=s"} = \$opt_vals{$name};
$help .= wrap(sprintf(" %-23s", $name), ' 'x25, "$msg under $name\n");
sub register_opt($$$) {
my ($prefix, $name, $msg) = @_;
$opts{"$prefix$name=s"} = \$opt_vals{$prefix.$name};
$help .= wrap(sprintf(" %-23s", $prefix.$name), ' 'x25, "$msg under $name\n");
}
$v->{script} = '' unless $v->{script};
$v->{options} =~ s/(\{exe\}|$)/ {options} $&/ unless $v->{options} =~ /\{options\}/;
register_opt "$k" => "Start mariadbd";
register_opt "client-$k" => "Start mariadb-test client";
register_opt "boot-$k" => "Start bootstrap server";
register_opt "manual-$k" => "Before running test(s) let user manually start mariadbd";
register_opt "", $k, "Start mysqld";
register_opt "client-", $k, "Start mysqltest client";
register_opt "boot-", $k, "Start bootstrap server";
register_opt "manual-", "$k", "Before running test(s) let user manually start mariadbd";
}
sub subst($%) {

9
mysql-test/lib/My/SysInfo.pm
View File

@@ -68,7 +68,7 @@ sub _cpuinfo {
}
}
$F= undef; # Close file
return $self;
return $self->{cpus};
}
@@ -95,12 +95,7 @@ sub _kstat {
push(@{$self->{cpus}}, $cpuinfo);
}
# At least one cpu should have been found
# if this method worked
if ( $self->{cpus} ) {
return $self;
}
return undef;
return $self->{cpus};
}