Merging with 5.1-rpl (17d7d227) · Commits · Software / OSDI20 Artifacts / mariadb

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` (

+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;

+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]

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		--loose-innodb

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		--innodb