← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/lock/lock0lock.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 03:44:24 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226034424-p300k39t2ss3upsb
Worked through page0zip.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/lock/lock0lock.cc
1303
1303
 
1304
1304
        size = sizeof(lock_t) + lock_rec_get_n_bits(lock) / 8;
1305
1305
 
1306
 
        return static_cast<lock_t>(mem_heap_dup(heap, lock, size));
 
1306
        return static_cast<lock_t *>(mem_heap_dup(heap, lock, size));
1307
1307
}
1308
1308
 
1309
1309
/*********************************************************************//**
1418
1418
        while (lock) {
1419
1419
                if (lock->trx == trx
1420
1420
                    && lock_mode_stronger_or_eq(lock_get_mode(lock),
1421
 
                                                precise_mode & LOCK_MODE_MASK)
 
1421
                                                static_cast<lock_mode>(precise_mode & LOCK_MODE_MASK))
1422
1422
                    && !lock_get_wait(lock)
1423
1423
                    && (!lock_rec_get_rec_not_gap(lock)
1424
1424
                        || (precise_mode & LOCK_REC_NOT_GAP)
3595
3595
 
3596
3596
                ib_vector_push(trx->autoinc_locks, lock);
3597
3597
        } else {
3598
 
                lock = mem_heap_alloc(trx->lock_heap, sizeof(lock_t));
 
3598
                lock = static_cast<lock_t *>(mem_heap_alloc(trx->lock_heap, sizeof(lock_t)));
3599
3599
        }
3600
3600
 
3601
3601
        UT_LIST_ADD_LAST(trx_locks, trx->trx_locks, lock);
3656
3656
                    && !ib_vector_is_empty(trx->autoinc_locks)) {
3657
3657
                        lock_t* autoinc_lock;
3658
3658
 
3659
 
                        autoinc_lock = static_cast<lock_t>(ib_vector_pop(trx->autoinc_locks));
 
3659
                        autoinc_lock = static_cast<lock_t *>(ib_vector_pop(trx->autoinc_locks));
3660
3660
                        ut_a(autoinc_lock == lock);
3661
3661
                }
3662
3662
 
5492
5492
 
5493
5493
        /* The lock to be release must be the last lock acquired. */
5494
5494
        last = ib_vector_size(autoinc_locks) - 1;
5495
 
        lock = static_cast<lock_t>(ib_vector_get(autoinc_locks, last));
 
5495
        lock = static_cast<lock_t *>(ib_vector_get(autoinc_locks, last));
5496
5496
 
5497
5497
        /* Should have only AUTOINC locks in the vector. */
5498
5498
        ut_a(lock_get_mode(lock) == LOCK_AUTO_INC);