~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/trx/trx0roll.c

  • 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:
132
132
{
133
133
        int     err;
134
134
 
135
 
        if (trx->conc_state == TRX_NOT_STARTED) {
 
135
        if (trx->state == TRX_NOT_STARTED) {
136
136
 
137
137
                return(DB_SUCCESS);
138
138
        }
161
161
{
162
162
        int     err;
163
163
 
164
 
        if (trx->conc_state == TRX_NOT_STARTED) {
 
164
        if (trx->state == TRX_NOT_STARTED) {
165
165
 
166
166
                return(DB_SUCCESS);
167
167
        }
263
263
                return(DB_NO_SAVEPOINT);
264
264
        }
265
265
 
266
 
        if (trx->conc_state == TRX_NOT_STARTED) {
 
266
        if (trx->state == TRX_NOT_STARTED) {
267
267
                ut_print_timestamp(stderr);
268
268
                fputs("  InnoDB: Error: transaction has a savepoint ", stderr);
269
269
                ut_print_name(stderr, trx, FALSE, savep->name);
560
560
                        continue;
561
561
                }
562
562
 
563
 
                switch (trx->conc_state) {
 
563
                switch (trx->state) {
564
564
                case TRX_NOT_STARTED:
565
565
                case TRX_PREPARED:
566
566
                        continue;