mirror of
https://github.com/MariaDB/server.git
synced 2025-07-24 19:42:23 +03:00
Fix for bug #22728 "Handler_rollback value is growing".
The bug is present only in 4.1, will be null-merged to 5.0 For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback. mysql-test/r/innodb_mysql.result: Added testcase for bug #22728 "Handler_rollback value is growing" mysql-test/t/innodb_mysql.test: Added testcase for bug #22728 "Handler_rollback value is growing" sql/handler.cc: For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.
This commit is contained in:
@ -648,7 +648,7 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans)
|
||||
}
|
||||
#endif
|
||||
#ifdef HAVE_INNOBASE_DB
|
||||
if (trans->innobase_tid)
|
||||
if (thd->transaction.all.innodb_active_trans)
|
||||
{
|
||||
if ((error=innobase_rollback(thd, trans->innobase_tid)))
|
||||
{
|
||||
|
Reference in New Issue
Block a user