← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sql/log_event_old.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/log_event_old.cc
1
 
/* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 
1
/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
2
2
 
3
3
   This program is free software; you can redistribute it and/or modify
4
4
   it under the terms of the GNU General Public License as published by
1808
1808
      Xid_log_event will come next which will, if some transactional engines
1809
1809
      are involved, commit the transaction and flush the pending event to the
1810
1810
      binlog.
 
1811
      If there was a deadlock the transaction should have been rolled back
 
1812
      already. So there should be no need to rollback the transaction.
1811
1813
    */
 
1814
    DBUG_ASSERT(! thd->transaction_rollback_request);
1812
1815
    if ((error= (binlog_error ? trans_rollback_stmt(thd) : trans_commit_stmt(thd))))
1813
1816
      rli->report(ERROR_LEVEL, error,
1814
1817
                  "Error in %s event: commit of row events failed, "