mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 11:57:38 +02:00
Merge bk-internal:/home/bk/mysql-5.1-rpl
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl mysql-test/lib/mtr_cases.pm: Auto merged mysql-test/suite/rpl_ndb/t/disabled.def: Auto merged
This commit is contained in:
commit
255e30a5bc
12 changed files with 81 additions and 11 deletions
|
|
@ -753,6 +753,16 @@ sub collect_one_test_case {
|
|||
# Add slave opts, list of extra option only for slave
|
||||
# ----------------------------------------------------------------------
|
||||
process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt');
|
||||
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
# Check for test specific config file
|
||||
#-----------------------------------------------------------------------
|
||||
my $test_cnf_file= "$testdir/$tname.cnf";
|
||||
if ( -f $test_cnf_file) {
|
||||
# Specifies the configuration file to use for this test
|
||||
$tinfo->{'template_path'}= $test_cnf_file;
|
||||
}
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Check for test specific config file
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue