~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/row/row0sel.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:
3813
3813
                trx->has_search_latch = FALSE;
3814
3814
        }
3815
3815
 
3816
 
        ut_ad(prebuilt->sql_stat_start || trx->conc_state == TRX_ACTIVE);
3817
 
        ut_ad(trx->conc_state == TRX_NOT_STARTED
3818
 
              || trx->conc_state == TRX_ACTIVE);
 
3816
        ut_ad(prebuilt->sql_stat_start || trx->state == TRX_ACTIVE);
 
3817
        ut_ad(trx->state == TRX_NOT_STARTED
 
3818
              || trx->state == TRX_ACTIVE);
3819
3819
        ut_ad(prebuilt->sql_stat_start
3820
3820
              || prebuilt->select_lock_type != LOCK_NONE
3821
3821
              || trx->read_view);
4897
4897
                if (trx->isolation_level >= TRX_ISO_REPEATABLE_READ
4898
4898
                    && !trx->read_view) {
4899
4899
 
4900
 
                        trx->read_view = read_view_open_now(
4901
 
                                trx->id, NULL);
 
4900
                        trx->read_view =
 
4901
                                read_view_open_now(trx->id,
 
4902
                                                   NULL, TRUE);
 
4903
 
4902
4904
                        trx->global_read_view = trx->read_view;
4903
4905
                }
4904
4906
        }