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

mysql-test/extra/rpl_tests/rpl_log.test

+6 −5

Original line number	Diff line number	Diff line
		@@ -77,11 +77,12 @@ connection slave;
		# to go into the relay log (the master always sends a fake one when replication
		# starts).
		start slave;
		#
		# This is timing out in pushbuild and should be changed to use
		# wait_slave_status.inc
		#
		sleep 2;
		--disable_query_log
		--disable_result_log
		let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000007%Yes%Yes%0%0%None%';
		--source include/wait_slave_status.inc
		--enable_query_log
		--enable_result_log
		sync_with_master;
		flush logs;
		stop slave;

mysql-test/r/innodb_mysql.result

+56 −1

Original line number	Diff line number	Diff line
		drop table if exists t1;
		drop table if exists t1,t2;
		create table t1 (
		c_id int(11) not null default '0',
		org_id int(11) default null,
		unique key contacts$c_id (c_id),
		key contacts$org_id (org_id)
		) engine=innodb;
		insert into t1 values
		(2,null),(120,null),(141,null),(218,7), (128,1),
		(151,2),(234,2),(236,2),(243,2),(255,2),(259,2),(232,3),(235,3),(238,3),
		(246,3),(253,3),(269,3),(285,3),(291,3),(293,3),(131,4),(230,4),(231,4);
		create table t2 (
		slai_id int(11) not null default '0',
		owner_tbl int(11) default null,
		owner_id int(11) default null,
		sla_id int(11) default null,
		inc_web int(11) default null,
		inc_email int(11) default null,
		inc_chat int(11) default null,
		inc_csr int(11) default null,
		inc_total int(11) default null,
		time_billed int(11) default null,
		activedate timestamp null default null,
		expiredate timestamp null default null,
		state int(11) default null,
		sla_set int(11) default null,
		unique key t2$slai_id (slai_id),
		key t2$owner_id (owner_id),
		key t2$sla_id (sla_id)
		) engine=innodb;
		insert into t2(slai_id, owner_tbl, owner_id, sla_id) values
		(1,3,1,1), (3,3,10,2), (4,3,3,6), (5,3,2,5), (6,3,8,3), (7,3,9,7),
		(8,3,6,8), (9,3,4,9), (10,3,5,10), (11,3,11,11), (12,3,7,12);
		flush tables;
		select si.slai_id
		from t1 c join t2 si on
		((si.owner_tbl = 3 and si.owner_id = c.org_id) or
		( si.owner_tbl = 2 and si.owner_id = c.c_id))
		where
		c.c_id = 218 and expiredate is null;
		slai_id
		12
		select * from t1 where org_id is null;
		c_id org_id
		2 NULL
		120 NULL
		141 NULL
		select si.slai_id
		from t1 c join t2 si on
		((si.owner_tbl = 3 and si.owner_id = c.org_id) or
		( si.owner_tbl = 2 and si.owner_id = c.c_id))
		where
		c.c_id = 218 and expiredate is null;
		slai_id
		12
		drop table t1, t2;

mysql-test/r/rpl_user_variables.result

+1 −0

Original line number	Diff line number	Diff line
		@@ -78,5 +78,6 @@ abcn1
		abcn1n2
		abc\def
		This is a test
		insert into t1 select * FROM (select @var1 union select @var2) AS t2;
		drop table t1;
		stop slave;

mysql-test/t/innodb_mysql.test

+55 −1

Original line number	Diff line number	Diff line
		-- source include/have_innodb.inc

		--disable_warnings
		drop table if exists t1;
		drop table if exists t1,t2;
		--enable_warnings

		# BUG#16798: Uninitialized row buffer reads in ref-or-null optimizer
		# (repeatable only w/innodb).
		create table t1 (
		c_id int(11) not null default '0',
		org_id int(11) default null,
		unique key contacts$c_id (c_id),
		key contacts$org_id (org_id)
		) engine=innodb;
		insert into t1 values
		(2,null),(120,null),(141,null),(218,7), (128,1),
		(151,2),(234,2),(236,2),(243,2),(255,2),(259,2),(232,3),(235,3),(238,3),
		(246,3),(253,3),(269,3),(285,3),(291,3),(293,3),(131,4),(230,4),(231,4);

		create table t2 (
		slai_id int(11) not null default '0',
		owner_tbl int(11) default null,
		owner_id int(11) default null,
		sla_id int(11) default null,
		inc_web int(11) default null,
		inc_email int(11) default null,
		inc_chat int(11) default null,
		inc_csr int(11) default null,
		inc_total int(11) default null,
		time_billed int(11) default null,
		activedate timestamp null default null,
		expiredate timestamp null default null,
		state int(11) default null,
		sla_set int(11) default null,
		unique key t2$slai_id (slai_id),
		key t2$owner_id (owner_id),
		key t2$sla_id (sla_id)
		) engine=innodb;
		insert into t2(slai_id, owner_tbl, owner_id, sla_id) values
		(1,3,1,1), (3,3,10,2), (4,3,3,6), (5,3,2,5), (6,3,8,3), (7,3,9,7),
		(8,3,6,8), (9,3,4,9), (10,3,5,10), (11,3,11,11), (12,3,7,12);

		flush tables;
		select si.slai_id
		from t1 c join t2 si on
		((si.owner_tbl = 3 and si.owner_id = c.org_id) or
		( si.owner_tbl = 2 and si.owner_id = c.c_id))
		where
		c.c_id = 218 and expiredate is null;

		select * from t1 where org_id is null;
		select si.slai_id
		from t1 c join t2 si on
		((si.owner_tbl = 3 and si.owner_id = c.org_id) or
		( si.owner_tbl = 2 and si.owner_id = c.c_id))
		where
		c.c_id = 218 and expiredate is null;

		drop table t1, t2;

mysql-test/t/rpl_user_variables.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ SELECT * FROM t1 ORDER BY n;
		sync_slave_with_master;
		SELECT * FROM t1 ORDER BY n;
		connection master;
		insert into t1 select * FROM (select @var1 union select @var2) AS t2;
		drop table t1;
		sync_slave_with_master;
		stop slave;