mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
bf9057f9b9
Removed the flag that disables innodb on slave in the default configuration of replication tests. That made the explicit --innodb flag in -slave.opt files redundant, so lots of -slave.opt files could be removed. Also, -master.opt files containing reduntant --innodb flag were removed (those were redundant even without changing the default). Removing .opt files is good because .opt files cause server restarts and make tests less readable. Also fixed a bug where rpl_innodb_mixed_ddl unintentionally used myisam on slave. mysql-test/suite/rpl/r/rpl_innodb.result: updated result file mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result: updated result file. this is how the test is supposed to be, it was a bug that it used myisam on the slave. mysql-test/suite/rpl/rpl_1slave_base.cnf: Removed flag to disable innodb on slave, and added explicit --loose-innodb flags on both master and slave. mysql-test/suite/rpl/t/rpl_innodb.test: Ensure that the slave uses myisam (this was previously done by not adding the --innodb flag on slave).
1 line
85 B
Text
1 line
85 B
Text
--innodb_lock_wait_timeout=4 --slave-transaction-retries=2 --max-relay-log-size=4096
|