Backport kostja's fix for Bug#32724 "innodb_mysql.test fails randomly". (a454190f) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/include/mix1.inc

+1 −0

Original line number	Diff line number	Diff line
		@@ -1309,6 +1309,7 @@ SELECT * FROM t1;

		--echo # Switch to connection con2
		connection con2;
		--reap
		SELECT * FROM t1;

		--echo # Switch to connection con1

+11 −11

Original line number	Diff line number	Diff line
		@@ -887,13 +887,13 @@ EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
		id 1
		select_type SIMPLE
		table t1
		type index
		type range
		possible_keys bkey
		key PRIMARY
		key_len 4
		key bkey
		key_len 5
		ref NULL
		rows 32
		Extra Using where
		rows 16
		Extra Using where; Using index; Using filesort
		SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
		a b
		1 2
		@@ -982,13 +982,13 @@ EXPLAIN SELECT * FROM t2 WHERE b=1 ORDER BY a;
		id 1
		select_type SIMPLE
		table t2
		type index
		type ref
		possible_keys bkey
		key PRIMARY
		key_len 4
		ref NULL
		rows 16
		Extra Using where; Using index
		key bkey
		key_len 5
		ref const
		rows 8
		Extra Using where; Using index; Using filesort
		SELECT * FROM t2 WHERE b=1 ORDER BY a;
		a b c
		1 1 1

+0 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@
		#
		##############################################################################
		federated_transactions : Bug#29523 Transactions do not work
		innodb_mysql : Bug#32724: innodb_mysql.test fails randomly
		status : Bug#32966 main.status fails
		ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
		csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables

+1 −0

Original line number	Diff line number	Diff line
		@@ -3301,6 +3301,7 @@ mysql_execute_command(THD *thd)
		can free its locks if LOCK TABLES locked some tables before finding
		that it can't lock a table in its list
		*/
		ha_autocommit_or_rollback(thd, 1);
		end_active_trans(thd);
		thd->options&= ~(OPTION_TABLE_LOCK);
		}