summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/rpl_1slave_base.cnf
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-08-17 11:14:46 +0400
committerSergei Golubchik <sergii@pisem.net>2010-08-17 11:14:46 +0400
commit8da7be63027403c5b82eda378842142cdcbad95c (patch)
treeb7dca1ad91ae877215e49ddf87d3fbc52544e546 /mysql-test/suite/rpl/rpl_1slave_base.cnf
parentb87a73773913ebdcfdacb2d8b8704958bc0e93f2 (diff)
downloadmariadb-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/rpl/rpl_1slave_base.cnf')
-rw-r--r--mysql-test/suite/rpl/rpl_1slave_base.cnf3
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf
index 23b7ded9a7d..8cdc3a1f6b0 100644
--- a/mysql-test/suite/rpl/rpl_1slave_base.cnf
+++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf
@@ -8,8 +8,6 @@
log-bin= master-bin
-loose-innodb
-
[mysqld.2]
# Run the slave.sh script before starting this process
#!run-slave-sh
@@ -18,7 +16,6 @@ loose-innodb
# starting the mysqld
#!use-slave-opt
-log-bin= slave-bin
relay-log= slave-relay-bin
init-rpl-role= slave