← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mysql-5.5/utopic

« back to all changes in this revision

Viewing changes to sql/sql_handler.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-10-24 13:02:18 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20131024130218-kmsafm2gr2fza5k6
Tags: 5.5.34-0ubuntu1
https://launchpad.net/bugs/1243253
* SECURITY UPDATE: Update to 5.5.34 to fix security issues (LP: #1243253)
  - http://www.oracle.com/technetwork/topics/security/cpuoct2013-1899837.html
  - CVE-2013-3839
  - CVE-2013-5807

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_handler.cc
589
589
    /*
590
590
      Always close statement transaction explicitly,
591
591
      so that the engine doesn't have to count locks.
 
592
      There should be no need to perform transaction
 
593
      rollback due to deadlock.
592
594
    */
 
595
    DBUG_ASSERT(! thd->transaction_rollback_request);
593
596
    trans_rollback_stmt(thd);
594
597
    mysql_ha_close_table(thd, hash_tables);
595
598
    goto retry;