From a454190f0d2ed04be54bf8400fb68f139452c5a1 Mon Sep 17 00:00:00 2001
From: "davi@mysql.com/endora.local" <>
Date: Tue, 29 Apr 2008 00:03:19 -0300
Subject: [PATCH] Backport kostja's fix for Bug#32724 "innodb_mysql.test fails
 randomly". Enable back the disabled test case.

---
 mysql-test/include/mix1.inc      |  1 +
 mysql-test/r/innodb_mysql.result | 22 +++++++++++-----------
 mysql-test/t/disabled.def        |  1 -
 sql/sql_parse.cc                 |  1 +
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc
index a4cd6019be8..fdac8deb87e 100644
--- a/mysql-test/include/mix1.inc
+++ b/mysql-test/include/mix1.inc
@@ -1309,6 +1309,7 @@ SELECT * FROM t1;
 
 --echo # Switch to connection con2
 connection con2;
+--reap
 SELECT * FROM t1;
 
 --echo # Switch to connection con1
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index c7f5e72bb8b..8008fd50a90 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -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
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 2025725fbdc..8c58ac5b742 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -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
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 2b57071d497..f2e8d713371 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3301,6 +3301,7 @@ end_with_restore_list:
         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);
     }