diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-08-17 11:14:46 +0400 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-08-17 11:14:46 +0400 |
| commit | 8da7be63027403c5b82eda378842142cdcbad95c (patch) | |
| tree | b7dca1ad91ae877215e49ddf87d3fbc52544e546 /mysql-test/suite/federated | |
| parent | b87a73773913ebdcfdacb2d8b8704958bc0e93f2 (diff) | |
| download | mariadb-git-8da7be63027403c5b82eda378842142cdcbad95c.tar.gz | |
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
Diffstat (limited to 'mysql-test/suite/federated')
| -rw-r--r-- | mysql-test/suite/federated/federated_innodb-slave.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/federated/my.cnf | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/suite/federated/federated_innodb-slave.opt b/mysql-test/suite/federated/federated_innodb-slave.opt index 627becdbfb5..48457b17309 100644 --- a/mysql-test/suite/federated/federated_innodb-slave.opt +++ b/mysql-test/suite/federated/federated_innodb-slave.opt @@ -1 +1 @@ ---innodb +--loose-innodb diff --git a/mysql-test/suite/federated/my.cnf b/mysql-test/suite/federated/my.cnf index 82600949712..7556abad300 100644 --- a/mysql-test/suite/federated/my.cnf +++ b/mysql-test/suite/federated/my.cnf @@ -3,9 +3,10 @@ [mysqld.1] log-bin= master-bin +loose-federated [mysqld.2] - +loose-federated [ENV] MASTER_MYPORT= @mysqld.1.port |