Commit 2dca77e4 authored by Sven Sandberg's avatar Sven Sandberg
Browse files

BUG#40257: Please remove --loose-skip-innodb from suite/rpl/rpl_1slave_base.cnf 

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.
parent a7b0312c

mysql-test/suite/rpl/r/rpl_innodb.result

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ CREATE TEMPORARY TABLE mysqltest1.tmp (f1 BIGINT); 
CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB";

SET AUTOCOMMIT = 0;

-------- switch to slave --------

ALTER TABLE mysqltest1.t1 ENGINE = MyISAM;

SHOW CREATE TABLE mysqltest1.t1;

Table	Create Table

t1	CREATE TABLE `t1` (

mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` ( 
  `b` char(254) DEFAULT NULL,

  PRIMARY KEY (`a`),

  KEY `index1` (`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

) ENGINE=InnoDB DEFAULT CHARSET=latin1

SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (
@@ -85,7 +85,7 @@ t2 CREATE TABLE `t2` ( 
  `b` char(254) DEFAULT NULL,

  PRIMARY KEY (`a`),

  KEY `index1` (`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

) ENGINE=InnoDB DEFAULT CHARSET=latin1



******************** DDL for indexes ********************

ALTER TABLE t2 ADD COLUMN d datetime;
@@ -120,7 +120,7 @@ t1 CREATE TABLE `t1` ( 
  `b` char(254) DEFAULT NULL,

  PRIMARY KEY (`a`),

  KEY `index1` (`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

) ENGINE=InnoDB DEFAULT CHARSET=latin1

SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (
@@ -131,7 +131,7 @@ t2 CREATE TABLE `t2` ( 
  KEY `index1` (`b`),

  KEY `index2` (`d`),

  KEY `index3` (`a`,`d`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

) ENGINE=InnoDB DEFAULT CHARSET=latin1

ALTER TABLE t2 DROP COLUMN d;

mysql-test/suite/rpl/rpl_1slave_base.cnf

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


log-bin=                 master-bin



loose-innodb



[mysqld.2]

# Run the slave.sh script before starting this process

#!run-slave-sh
@@ -39,7 +41,7 @@ slave-load-tmpdir= ../../tmp 


rpl-recovery-rank=          @mysqld.2.server-id



loose-skip-innodb

loose-innodb





[ENV]

mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
--loose-innodb

mysql-test/suite/rpl/t/rpl_bug26395-master.opt

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
--innodb