mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
generalization of mtr to support suite.pm extensions:
* no automatic --loose-skip-innodb added by mtr based on the test name. instead loose-skip-innodb is now in the default_mysqld.cnf * have_innodb_plugin.inc is changed to give a verbose "skip" message (instead of "require: true") * My::Suite class. It's support in mtr, and everywhere * support for suite.pm * when sorting tests, take combinations into account * support for SUITENAME_COMBINATIONS * no special treatment for innodb_plugin in mtr_cases.pm * two special pre-created config groups: ENV and OPT * allow option names to start from # * allow magic option to have an argument * remove dead code * fix @-substitution to works as expected * new processes take the value of $opt_verbose automatically, no need to pass it to a constructor * innodb_plugin suite uses suite.pm and combinations file to test as much as possible (innodb plugin, xtradb plugin, xtradb static - whatever available) * besides test-master.opt and test-slave.opt a test.opt file is also loaded, both for master and slave * .opt files for all included files are loaded too * progress report in the xterm titlebar
This commit is contained in:
@ -6,9 +6,6 @@
|
||||
# Run the master.sh script before starting this process
|
||||
#!run-master-sh
|
||||
|
||||
log-bin= master-bin
|
||||
|
||||
|
||||
[mysqlbinlog]
|
||||
disable-force-if-open
|
||||
|
||||
|
@ -13,9 +13,10 @@ key_buffer_size= 1M
|
||||
sort_buffer= 256K
|
||||
max_heap_table_size= 1M
|
||||
|
||||
loose-skip-innodb
|
||||
loose-skip-pbxt
|
||||
|
||||
loose-innodb_data_file_path= ibdata1:10M:autoextend
|
||||
|
||||
slave-net-timeout=120
|
||||
|
||||
log-bin=mysqld-bin
|
||||
|
||||
|
1
mysql-test/include/have_binlog_format_mixed.opt
Normal file
1
mysql-test/include/have_binlog_format_mixed.opt
Normal file
@ -0,0 +1 @@
|
||||
--binlog-format=mixed
|
1
mysql-test/include/have_binlog_format_row.opt
Normal file
1
mysql-test/include/have_binlog_format_row.opt
Normal file
@ -0,0 +1 @@
|
||||
--binlog-format=row
|
2
mysql-test/include/have_binlog_format_statement.opt
Normal file
2
mysql-test/include/have_binlog_format_statement.opt
Normal file
@ -0,0 +1,2 @@
|
||||
--binlog-format=statement
|
||||
|
@ -1,4 +0,0 @@
|
||||
disable_query_log;
|
||||
--require r/true.require
|
||||
select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'example';
|
||||
enable_query_log;
|
@ -1,4 +1,5 @@
|
||||
disable_query_log;
|
||||
--require r/true.require
|
||||
select (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` from information_schema.engines where engine = 'innodb';
|
||||
enable_query_log;
|
||||
if (!`SELECT count(*) FROM information_schema.engines WHERE
|
||||
(support = 'YES' OR support = 'DEFAULT') AND
|
||||
engine = 'innodb'`){
|
||||
skip Needs innodb engine;
|
||||
}
|
||||
|
1
mysql-test/include/have_innodb.opt
Normal file
1
mysql-test/include/have_innodb.opt
Normal file
@ -0,0 +1 @@
|
||||
--loose-innodb
|
@ -1,4 +1,5 @@
|
||||
disable_query_log;
|
||||
--require r/true.require
|
||||
SELECT (plugin_library LIKE 'ha_innodb_plugin%' OR plugin_description LIKE '%xtradb%') AS `TRUE` FROM information_schema.plugins WHERE LOWER(plugin_name) = 'innodb' AND LOWER(plugin_status) = 'active';
|
||||
enable_query_log;
|
||||
if (!`SELECT COUNT(*) FROM INFORMATION_SCHEMA.PLUGINS
|
||||
WHERE PLUGIN_NAME = 'innodb' AND PLUGIN_STATUS = 'active' AND
|
||||
(PLUGIN_LIBRARY LIKE 'ha_innodb_plugin%' OR PLUGIN_DESCRIPTION LIKE '%xtradb%')`) {
|
||||
skip Need InnoDB plugin or XtraDB;
|
||||
}
|
||||
|
1
mysql-test/include/have_log_bin-master.opt
Normal file
1
mysql-test/include/have_log_bin-master.opt
Normal file
@ -0,0 +1 @@
|
||||
--log-bin=master-bin
|
1
mysql-test/include/have_log_bin-slave.opt
Normal file
1
mysql-test/include/have_log_bin-slave.opt
Normal file
@ -0,0 +1 @@
|
||||
--log-bin=slave-bin
|
@ -6,6 +6,8 @@
|
||||
#
|
||||
# source include/have_log_bin.inc;
|
||||
|
||||
source include/not_embedded.inc;
|
||||
|
||||
-- require r/have_log_bin.require
|
||||
disable_query_log;
|
||||
show variables like 'log_bin';
|
||||
|
1
mysql-test/include/have_pbxt.opt
Normal file
1
mysql-test/include/have_pbxt.opt
Normal file
@ -0,0 +1 @@
|
||||
--loose-pbxt
|
Reference in New Issue
Block a user