database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge polly.local:/tmp/maint/bug22728/my41-bug22728

Browse Source 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/handler.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manually merged
mysql-test/t/innodb_mysql.test:
  Manually merged
This commit is contained in:
unknown
2006-10-12 13:39:52 +04:00
parent f29fb0415e ca126a2bbd
commit 72a997c0ea
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.cc
View File

@ -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)))
{