~ubuntu-branches/ubuntu/natty/mysql-5.1/natty-proposed

« back to all changes in this revision

Viewing changes to storage/innobase/log/log0log.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 08:30:45 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120222083045-2rd53r4bnyx7qus4
Tags: 5.1.61-0ubuntu0.11.04.1
* SECURITY UPDATE: Update to 5.1.61 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2011-2262
  - CVE-2012-0075
  - CVE-2012-0112
  - CVE-2012-0113
  - CVE-2012-0114
  - CVE-2012-0115
  - CVE-2012-0116
  - CVE-2012-0117
  - CVE-2012-0118
  - CVE-2012-0119
  - CVE-2012-0120
  - CVE-2012-0484
  - CVE-2012-0485
  - CVE-2012-0486
  - CVE-2012-0487
  - CVE-2012-0488
  - CVE-2012-0489
  - CVE-2012-0490
  - CVE-2012-0491
  - CVE-2012-0492
  - CVE-2012-0493
  - CVE-2012-0494
  - CVE-2012-0495
  - CVE-2012-0496

Show diffs side-by-side

added added

removed removed

Lines of Context:
3052
3052
                goto loop;
3053
3053
        }
3054
3054
 
3055
 
        /* Check that there are no longer transactions. We need this wait even
3056
 
        for the 'very fast' shutdown, because the InnoDB layer may have
3057
 
        committed or prepared transactions and we don't want to lose them. */
 
3055
        /* Check that there are no longer transactions, except for
 
3056
        PREPARED ones. We need this wait even for the 'very fast'
 
3057
        shutdown, because the InnoDB layer may have committed or
 
3058
        prepared transactions and we don't want to lose them. */
3058
3059
 
3059
3060
        if (trx_n_mysql_transactions > 0
3060
 
            || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
 
3061
            || UT_LIST_GET_LEN(trx_sys->trx_list) > trx_n_prepared) {
3061
3062
 
3062
3063
                mutex_exit(&kernel_mutex);
3063
3064