Commit 37f97b29 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

Merge perch.ndb.mysql.com:/home/jonas/src/50-work

into  perch.ndb.mysql.com:/home/jonas/src/51-work
parents 13c44a91 7232d0f2
...@@ -926,7 +926,10 @@ NdbTransaction::release(){ ...@@ -926,7 +926,10 @@ NdbTransaction::release(){
* The user did not perform any rollback but simply closed the * The user did not perform any rollback but simply closed the
* transaction. We must rollback Ndb since Ndb have been contacted. * transaction. We must rollback Ndb since Ndb have been contacted.
************************************************************************/ ************************************************************************/
execute(Rollback); if (!theSimpleState)
{
execute(Rollback);
}
}//if }//if
theMagicNumber = 0xFE11DC; theMagicNumber = 0xFE11DC;
theInUseState = false; theInUseState = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment