← Back to branch summary

~james-page/ubuntu/precise/mysql-5.5/misc-fixes

« back to all changes in this revision

Viewing changes to sql/transaction.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-11 07:34:33 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120611073433-l9za2ni4ipp848y3
Tags: 5.5.24-0ubuntu0.12.04.1
https://launchpad.net/bugs/1011371
* SECURITY UPDATE: Update to 5.5.24 to fix security issues (LP: #1011371)
  - http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/transaction.cc
390
390
    DBUG_RETURN(FALSE);
391
391
 
392
392
  enum xa_states xa_state= thd->transaction.xid_state.xa_state;
393
 
  if (xa_state != XA_NOTR)
 
393
  if (xa_state != XA_NOTR && xa_state != XA_ACTIVE)
394
394
  {
395
395
    my_error(ER_XAER_RMFAIL, MYF(0), xa_state_names[xa_state]);
396
396
    DBUG_RETURN(TRUE);