~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/handler/ha_innodb.cc

  • Committer: jenkins at percona
  • Date: 2013-03-26 01:40:02 UTC
  • mfrom: (450.9.2 bug1131189)
  • Revision ID: jenkins@jenkins.percona.com-20130326014002-1m2hg8pt1b27chq2
MergeĀ lp:~akopytov/percona-server/bug1131189

Show diffs side-by-side

added added

removed removed

Lines of Context:
1910
1910
/*===========*/
1911
1911
        trx_t*  trx)    /* in: transaction */
1912
1912
{
1913
 
        return(trx->conc_state != TRX_NOT_STARTED);
 
1913
        return(trx->state != TRX_NOT_STARTED);
1914
1914
}
1915
1915
 
1916
1916
/*********************************************************************//**
9046
9046
 
9047
9047
                                prebuilt->trx->op_info = "confirming rows of SYS_STATS to store statistics";
9048
9048
 
9049
 
                                ut_a(prebuilt->trx->conc_state == TRX_NOT_STARTED);
 
9049
                                ut_a(!trx_is_started(prebuilt->trx));
9050
9050
 
9051
9051
                                for (index = dict_table_get_first_index(ib_table);
9052
9052
                                     index != NULL;
9059
9059
                                        innobase_commit_low(prebuilt->trx);
9060
9060
                                }
9061
9061
 
9062
 
                                ut_a(prebuilt->trx->conc_state == TRX_NOT_STARTED);
 
9062
                                ut_a(!trx_is_started(prebuilt->trx));
9063
9063
                        }
9064
9064
 
9065
9065
                        prebuilt->trx->op_info = "updating table statistics";