From f4bd5105e2a87489227dc7aee780921204061dae Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Apr 2008 00:03:19 -0300 Subject: Backport kostja's fix for Bug#32724 "innodb_mysql.test fails randomly". Enable back the disabled test case. mysql-test/include/mix1.inc: Fix a race condition in the test, causing a sporadic failure. mysql-test/r/innodb_mysql.result: Update test case result. mysql-test/t/disabled.def: Enable the test case innodb_mysql. sql/sql_parse.cc: Fix the random failure of innodb_mysql test. The failure is not random any more after a patch for Bug 12713 added asserts around handler commit. --- sql/sql_parse.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/sql_parse.cc') 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); } -- cgit v1.2.1