mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
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.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user