Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new (420a6393) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,7 @@ connection con3;
		delete from t1;
		delete from t2;
		--disable_warnings
		alter table t2 type=MyISAM;
		alter table t2 engine=MyISAM;
		--enable_warnings
		insert into t1 values (1);
		begin;

mysql-test/r/binlog_stm_mix_innodb_myisam.result

+16 −16

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ master-bin.000001 258 Query 1 # use `test`; insert into t1 values(18)
		master-bin.000001 346 Xid 1 # COMMIT /* xid= */
		delete from t1;
		delete from t2;
		alter table t2 type=MyISAM;
		alter table t2 engine=MyISAM;
		insert into t1 values (1);
		begin;
		select * from t1 for update;
		@@ -239,20 +239,20 @@ master-bin.000001 373 Query 1 # use `test`; delete from t1
		master-bin.000001 450 Xid 1 # COMMIT /* xid= */
		master-bin.000001 477 Query 1 # use `test`; delete from t2
		master-bin.000001 554 Xid 1 # COMMIT /* xid= */
		master-bin.000001 581 Query 1 # use `test`; alter table t2 type=MyISAM
		master-bin.000001 670 Query 1 # use `test`; insert into t1 values (1)
		master-bin.000001 758 Xid 1 # COMMIT /* xid= */
		master-bin.000001 785 Query 1 # use `test`; insert into t2 values (20)
		master-bin.000001 874 Query 1 # use `test`; drop table t1,t2
		master-bin.000001 953 Query 1 # use `test`; create temporary table ti (a int) engine=innodb
		master-bin.000001 1063 Query 1 # use `test`; insert into ti values(1)
		master-bin.000001 1150 Xid 1 # COMMIT /* xid= */
		master-bin.000001 1177 Query 1 # use `test`; create temporary table t1 (a int) engine=myisam
		master-bin.000001 1287 Query 1 # use `test`; insert t1 values (1)
		master-bin.000001 1370 Query 1 # use `test`; create table t0 (n int)
		master-bin.000001 1456 Query 1 # use `test`; insert t0 select * from t1
		master-bin.000001 1545 Query 1 # use `test`; insert into t0 select GET_LOCK("lock1",null)
		master-bin.000001 1652 Query 1 # use `test`; create table t2 (n int) engine=innodb
		master-bin.000001 1752 Query 1 # use `test`; DROP /!40005 TEMPORARY / TABLE IF EXISTS `test`.`t1`,`test`.`ti`
		master-bin.000001 581 Query 1 # use `test`; alter table t2 engine=MyISAM
		master-bin.000001 672 Query 1 # use `test`; insert into t1 values (1)
		master-bin.000001 760 Xid 1 # COMMIT /* xid= */
		master-bin.000001 787 Query 1 # use `test`; insert into t2 values (20)
		master-bin.000001 876 Query 1 # use `test`; drop table t1,t2
		master-bin.000001 955 Query 1 # use `test`; create temporary table ti (a int) engine=innodb
		master-bin.000001 1065 Query 1 # use `test`; insert into ti values(1)
		master-bin.000001 1152 Xid 1 # COMMIT /* xid= */
		master-bin.000001 1179 Query 1 # use `test`; create temporary table t1 (a int) engine=myisam
		master-bin.000001 1289 Query 1 # use `test`; insert t1 values (1)
		master-bin.000001 1372 Query 1 # use `test`; create table t0 (n int)
		master-bin.000001 1458 Query 1 # use `test`; insert t0 select * from t1
		master-bin.000001 1547 Query 1 # use `test`; insert into t0 select GET_LOCK("lock1",null)
		master-bin.000001 1654 Query 1 # use `test`; create table t2 (n int) engine=innodb
		master-bin.000001 1754 Query 1 # use `test`; DROP /!40005 TEMPORARY / TABLE IF EXISTS `test`.`t1`,`test`.`ti`
		do release_lock("lock1");
		drop table t0,t2;

mysql-test/r/ctype_ujis.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ a INTEGER NOT NULL,
		b VARCHAR(50) NOT NULL DEFAULT '',
		PRIMARY KEY (a),
		KEY b (b(10))
		) TYPE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
		) ENGINE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
		INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
		INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
		INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');
		@@ -152,7 +152,7 @@ a INTEGER NOT NULL,
		b VARCHAR(50) NOT NULL DEFAULT '',
		PRIMARY KEY (a),
		KEY b (b(10))
		) TYPE=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
		) ENGINE=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
		INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
		INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
		INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');

mysql-test/r/innodb_concurrent.result

+7 −7

Original line number	Diff line number	Diff line
		drop table if exists t1;
		Warnings:
		Note 1051 Unknown table 't1'
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
		Warnings:
		Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
		insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
		@@ -106,7 +106,7 @@ eta tipo c
		2 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
		1 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
		drop table t1;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
		Warnings:
		Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
		insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
		@@ -239,7 +239,7 @@ a b
		1 1
		commit;
		drop table t1;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
		Warnings:
		Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
		insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
		@@ -323,7 +323,7 @@ eta tipo c
		80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
		90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
		drop table t1;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
		Warnings:
		Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
		insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
		@@ -407,7 +407,7 @@ eta tipo c
		80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
		90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
		drop table t1;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
		Warnings:
		Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
		insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
		@@ -478,7 +478,7 @@ eta tipo c
		80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
		90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
		drop table t1;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
		Warnings:
		Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
		insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
		@@ -549,7 +549,7 @@ eta tipo c
		80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
		90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
		drop table t1;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb;
		create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
		Warnings:
		Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
		insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");

mysql-test/r/rpl_heap.result

+3 −3

Original line number	Diff line number	Diff line
		reset master;
		drop table if exists t1;
		create table t1 type=HEAP select 10 as a;
		create table t1 ENGINE=HEAP select 10 as a;
		insert into t1 values(11);
		show binlog events from 79;
		Log_name Pos Event_type Server_id Orig_log_pos Info
		master-bin.001 79 Query 1 79 use `test`; create table t1 type=HEAP select 10 as a
		master-bin.001 79 Query 1 79 use `test`; create table t1 ENGINE=HEAP select 10 as a
		master-bin.001 154 Query 1 154 use `test`; insert into t1 values(11)
		reset slave;
		start slave;
		@@ -12,7 +12,7 @@ show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`a` bigint(2) NOT NULL default '0'
		) TYPE=HEAP
		) ENGINE=HEAP
		select * from t1;
		a
		10