mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +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).
84 lines
2.1 KiB
Text
84 lines
2.1 KiB
Text
stop slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
reset master;
|
|
reset slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
start slave;
|
|
CREATE TABLE t4 (
|
|
id INT(5) unsigned NOT NULL auto_increment,
|
|
name varchar(15) NOT NULL default '',
|
|
number varchar(35) NOT NULL default 'default',
|
|
PRIMARY KEY (id),
|
|
UNIQUE KEY unique_rec (name,number)
|
|
) ENGINE=InnoDB;
|
|
LOAD DATA
|
|
INFILE '../../std_data/loaddata_pair.dat'
|
|
REPLACE INTO TABLE t4
|
|
(name,number);
|
|
SELECT * FROM t4;
|
|
id name number
|
|
1 XXX 12345
|
|
2 XXY 12345
|
|
SELECT * FROM t4;
|
|
id name number
|
|
1 XXX 12345
|
|
2 XXY 12345
|
|
LOAD DATA
|
|
INFILE '../../std_data/loaddata_pair.dat'
|
|
REPLACE INTO TABLE t4
|
|
(name,number);
|
|
SELECT * FROM t4;
|
|
id name number
|
|
3 XXX 12345
|
|
4 XXY 12345
|
|
SELECT * FROM t4;
|
|
id name number
|
|
3 XXX 12345
|
|
4 XXY 12345
|
|
FLUSH LOGS;
|
|
FLUSH LOGS;
|
|
DROP DATABASE IF EXISTS mysqltest1;
|
|
CREATE DATABASE mysqltest1;
|
|
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` (
|
|
`f1` bigint(20) DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
-------- switch to master --------
|
|
INSERT INTO mysqltest1.t1 SET f1= 1;
|
|
DROP TEMPORARY TABLE mysqltest1.tmp;
|
|
ROLLBACK;
|
|
SHOW CREATE TABLE mysqltest1.tmp;
|
|
ERROR 42S02: Table 'mysqltest1.tmp' doesn't exist
|
|
SELECT COUNT(*) FROM mysqltest1.t1;
|
|
COUNT(*)
|
|
0
|
|
INSERT INTO mysqltest1.t1 SET f1= 2;
|
|
CREATE TEMPORARY TABLE mysqltest1.tmp2(a INT);
|
|
ROLLBACK;
|
|
SHOW CREATE TABLE mysqltest1.tmp2;
|
|
Table Create Table
|
|
tmp2 CREATE TEMPORARY TABLE `tmp2` (
|
|
`a` int(11) DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
SELECT COUNT(*) FROM mysqltest1.t1;
|
|
COUNT(*)
|
|
0
|
|
-------- switch to slave --------
|
|
SHOW CREATE TABLE mysqltest1.tmp;
|
|
ERROR 42S02: Table 'mysqltest1.tmp' doesn't exist
|
|
SHOW CREATE TABLE mysqltest1.tmp2;
|
|
ERROR 42S02: Table 'mysqltest1.tmp2' doesn't exist
|
|
SELECT COUNT(*) FROM mysqltest1.t1;
|
|
COUNT(*)
|
|
2
|
|
FLUSH LOGS;
|
|
-------- switch to master --------
|
|
FLUSH LOGS;
|
|
DROP DATABASE mysqltest1;
|
|
End of 5.1 tests
|