~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/include/trx0trx.ic

  • 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:
31
31
/*=====================*/
32
32
        trx_t*  trx)    /*!< in: transaction */
33
33
{
34
 
        ut_ad(trx->conc_state != TRX_COMMITTED_IN_MEMORY);
 
34
        ut_ad(trx->state != TRX_COMMITTED_IN_MEMORY);
35
35
 
36
 
        if (trx->conc_state == TRX_NOT_STARTED) {
 
36
        if (trx->state == TRX_NOT_STARTED) {
37
37
 
38
38
                trx_start(trx, ULINT_UNDEFINED);
39
39
        }
48
48
/*=========================*/
49
49
        trx_t*  trx)    /*!< in: transaction */
50
50
{
51
 
        ut_ad(trx->conc_state != TRX_COMMITTED_IN_MEMORY);
 
51
        ut_ad(trx->state != TRX_COMMITTED_IN_MEMORY);
52
52
 
53
 
        if (trx->conc_state == TRX_NOT_STARTED) {
 
53
        if (trx->state == TRX_NOT_STARTED) {
54
54
 
55
55
                trx_start_low(trx, ULINT_UNDEFINED);
56
56
        }