diff options
Diffstat (limited to 'mysql-test/lib/My')
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 3 | ||||
| -rw-r--r-- | mysql-test/lib/My/Debugger.pm | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 261de37ab54..3249a06256c 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -216,6 +216,7 @@ my @mysqld_rules= my @client_rules= ( { 'character-sets-dir' => \&fix_charset_dir }, + { 'plugin-dir' => sub { $::client_plugindir } }, ); @@ -346,7 +347,7 @@ sub resolve_at_variable { or croak "There is no group named '$group_name' that ", "can be used to resolve '$option_name' for test '$self->{testname}'"; - my $value= $from_group->value($option_name); + my $value= $from_group->value($option_name) || ''; $res .= $before.$value; } $res .= $after; diff --git a/mysql-test/lib/My/Debugger.pm b/mysql-test/lib/My/Debugger.pm index e7428572ca4..0f2585f45a7 100644 --- a/mysql-test/lib/My/Debugger.pm +++ b/mysql-test/lib/My/Debugger.pm @@ -125,10 +125,10 @@ for my $k (sort keys %debuggers) { $v->{script} = '' unless $v->{script}; $v->{options} =~ s/(\{exe\}|$)/ {options} $&/ unless $v->{options} =~ /\{options\}/; - register_opt "$k" => "Start mysqld"; - register_opt "client-$k" => "Start mysqltest client"; + 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 mysqld"; + register_opt "manual-$k" => "Before running test(s) let user manually start mariadbd"; } sub subst($%) { |