~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/lock/lock0lock.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:
4652
4652
        trx = UT_LIST_GET_FIRST(trx_sys->mysql_trx_list);
4653
4653
 
4654
4654
        while (trx) {
4655
 
                if (trx->conc_state == TRX_NOT_STARTED) {
 
4655
                if (trx->state == TRX_NOT_STARTED) {
4656
4656
                        fputs("---", file);
4657
4657
                        trx_print(file, trx, 600);
4658
4658
                }
4820
4820
        lock = UT_LIST_GET_FIRST(table->locks);
4821
4821
 
4822
4822
        while (lock) {
4823
 
                ut_a(((lock->trx)->conc_state == TRX_ACTIVE)
4824
 
                     || ((lock->trx)->conc_state == TRX_PREPARED)
4825
 
                     || ((lock->trx)->conc_state == TRX_COMMITTED_IN_MEMORY));
 
4823
                ut_a(((lock->trx)->state == TRX_ACTIVE)
 
4824
                     || ((lock->trx)->state == TRX_PREPARED)
 
4825
                     || ((lock->trx)->state == TRX_COMMITTED_IN_MEMORY));
4826
4826
 
4827
4827
                if (!lock_get_wait(lock)) {
4828
4828
 
4870
4870
                lock = lock_rec_get_first(block, heap_no);
4871
4871
 
4872
4872
                while (lock) {
4873
 
                        switch(lock->trx->conc_state) {
 
4873
                        switch(lock->trx->state) {
4874
4874
                        case TRX_ACTIVE:
4875
4875
                        case TRX_PREPARED:
4876
4876
                        case TRX_COMMITTED_IN_MEMORY:
4957
4957
        lock = lock_rec_get_first(block, heap_no);
4958
4958
 
4959
4959
        while (lock) {
4960
 
                ut_a(lock->trx->conc_state == TRX_ACTIVE
4961
 
                     || lock->trx->conc_state == TRX_PREPARED
4962
 
                     || lock->trx->conc_state == TRX_COMMITTED_IN_MEMORY);
 
4960
                ut_a(lock->trx->state == TRX_ACTIVE
 
4961
                     || lock->trx->state == TRX_PREPARED
 
4962
                     || lock->trx->state == TRX_COMMITTED_IN_MEMORY);
4963
4963
                ut_a(trx_in_trx_list(lock->trx));
4964
4964
 
4965
4965
                if (index) {
5036
5036
        }
5037
5037
 
5038
5038
        ut_a(trx_in_trx_list(lock->trx));
5039
 
        ut_a(lock->trx->conc_state == TRX_ACTIVE
5040
 
             || lock->trx->conc_state == TRX_PREPARED
5041
 
             || lock->trx->conc_state == TRX_COMMITTED_IN_MEMORY);
 
5039
        ut_a(lock->trx->state == TRX_ACTIVE
 
5040
             || lock->trx->state == TRX_PREPARED
 
5041
             || lock->trx->state == TRX_COMMITTED_IN_MEMORY);
5042
5042
 
5043
5043
# ifdef UNIV_SYNC_DEBUG
5044
5044
        /* Only validate the record queues when this thread is not