mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
overlay support for mysql-test-run and mysqltest
mysql-test-run auto-disables all optional plugins. mysql-test/include/default_client.cnf: no @OPT.plugindir anymore mysql-test/include/default_mysqld.cnf: don't disable plugins manually - mtr can do it better mysql-test/suite/innodb/t/innodb_bug47167.test: mtr now uses suite-dir as an include path mysql-test/suite/innodb/t/innodb_file_format.test: mtr now uses suite-dir as an include path mysql-test/t/partition_binlog.test: this test uses partitions storage/example/mysql-test/mtr/t/source.result: update results. as mysqltest includes the correct overlayed include storage/innobase/handler/ha_innodb.cc: the assert is wrong
This commit is contained in:
@@ -164,9 +164,6 @@ sub value {
|
||||
return $option->value();
|
||||
}
|
||||
|
||||
|
||||
sub auto { 0 };
|
||||
|
||||
#
|
||||
# Return value for an option if it exist
|
||||
#
|
||||
@@ -191,8 +188,6 @@ sub new {
|
||||
bless My::Config::Group->new($group_name), $class;
|
||||
}
|
||||
|
||||
sub auto { 1 };
|
||||
|
||||
#
|
||||
# Return value for an option in the group, fail if it does not exist
|
||||
#
|
||||
@@ -218,8 +213,6 @@ use strict;
|
||||
use warnings;
|
||||
use Carp;
|
||||
|
||||
sub auto { 1 };
|
||||
|
||||
sub new {
|
||||
my ($class, $group_name)= @_;
|
||||
bless My::Config::Group->new($group_name), $class;
|
||||
@@ -442,6 +435,17 @@ sub groups {
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Return a list with "real" groups in config, those
|
||||
# that should be written to a my.cnf file, those that contain options.
|
||||
# Same as groups() but without auto-generated groups like ENV or OPT.
|
||||
#
|
||||
sub option_groups {
|
||||
my ($self)= @_;
|
||||
return ( grep { ref $_ eq 'My::Config::Group' } @{$self->{groups}} );
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Return a list of all the groups in config
|
||||
# starting with the given string
|
||||
|
Reference in New Issue
Block a user