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

- Add autodetection of which my.cnfs to use for each testcase if suite does

Browse Source 
not have a my.cnf of it's own
- Fix paths: master-data => mysqld.1/data, ../std_data_ln => MYSQLTEST_VARDIR/std_data


mysql-test/lib/mtr_cases.pm:
  Add autodetection of which my.cnfs to use for each testcase if suite does
  not have a my.cnf of it's own
mysql-test/suite/parts/inc/partition.pre:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_basic.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_check_drop.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/partition_alter1_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter3_innodb.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter3_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter4_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_syntax_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_t55.out:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/t/partition_sessions.test:
  Update paths, master-data => mysqld.1/data
This commit is contained in:
unknown
2008-01-10 16:50:37 +01:00
parent cd7ab06e08
commit c6a1ed022c
21 changed files with 6186 additions and 6172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/lib/mtr_cases.pm
View File

@ -892,8 +892,19 @@ sub collect_one_test_case {
my $config= "$suitedir/my.cnf";
if (! -f $config )
{
# Suite has no config, use default.cnf
# assume default.cnf will be used
$config= "include/default_my.cnf";
# Suite has no config, autodetect which one to use
if ( $tinfo->{rpl_test} ){
$config= "suite/rpl/my.cnf";
if ( $tinfo->{ndb_test} ){
$config= "suite/rpl_ndb/my.cnf";
}
}
elsif ( $tinfo->{ndb_test} ){
$config= "suite/ndb/my.cnf";
}
}
$tinfo->{template_path}= $config;
}