bk commit into 5.1 tree (kostja:1.2586) BUG#32724

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja.  When kostja does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-07 15:42:32+04:00, kostja@dipika.(none) +2 -0
  A fix for Bug#32724 "innodb_mysql.test fails randomly".
  Enable back the disabled test case.

  mysql-test/t/disabled.def@stripped, 2008-04-07 15:42:29+04:00, kostja@dipika.(none) +0 -1
    Enable the test case innodb_mysql.

  sql/sql_parse.cc@stripped, 2008-04-07 15:42:29+04:00, kostja@dipika.(none) +1 -0
    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.

diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-03-27 14:25:33 +03:00
+++ b/mysql-test/t/disabled.def	2008-04-07 15:42:29 +04:00
@@ -16,7 +16,6 @@ ctype_big5               : BUG#26711 200
 
 federated_transactions   : Bug#29523 Transactions do not work
 lowercase_table3         : Bug#32667 lowercase_table3.test reports to error log
-innodb_mysql         : Bug#32724: innodb_mysql.test fails randomly
 ctype_create         : Bug#32965 main.ctype_create fails
 status               : Bug#32966 main.status fails
 ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2008-03-27 14:54:43 +03:00
+++ b/sql/sql_parse.cc	2008-04-07 15:42:29 +04:00
@@ -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);
     }