diff options
Diffstat (limited to 'innobase/lock')
| -rw-r--r-- | innobase/lock/lock0lock.c | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c index 1c9b1263130..c9c0cd109a9 100644 --- a/innobase/lock/lock0lock.c +++ b/innobase/lock/lock0lock.c @@ -402,10 +402,10 @@ lock_check_trx_id_sanity( fprintf(stderr, "\n" "InnoDB: is %lu %lu which is higher than the global trx id counter %lu %lu!\n" "InnoDB: The table is corrupt. You have to do dump + drop + reimport.\n", - ut_dulint_get_high(trx_id), - ut_dulint_get_low(trx_id), - ut_dulint_get_high(trx_sys->max_trx_id), - ut_dulint_get_low(trx_sys->max_trx_id)); + (ulong) ut_dulint_get_high(trx_id), + (ulong) ut_dulint_get_low(trx_id), + (ulong) ut_dulint_get_high(trx_sys->max_trx_id), + (ulong) ut_dulint_get_low(trx_sys->max_trx_id)); is_ok = FALSE; } @@ -1687,7 +1687,7 @@ lock_rec_enqueue_waiting( if (lock_print_waits) { fprintf(stderr, "Lock wait for trx %lu in index ", - ut_dulint_get_low(trx->id)); + (ulong) ut_dulint_get_low(trx->id)); ut_print_name(stderr, index->name); } @@ -2030,7 +2030,7 @@ lock_grant( if (lock_print_waits) { fprintf(stderr, "Lock wait for trx %lu ends\n", - ut_dulint_get_low(lock->trx->id)); + (ulong) ut_dulint_get_low(lock->trx->id)); } /* If we are resolving a deadlock by choosing another transaction @@ -3598,7 +3598,8 @@ lock_release_off_kernel( ut_ad(lock_get_type(lock) & LOCK_TABLE); if (lock_get_mode(lock) != LOCK_IS - && (trx->insert_undo || trx->update_undo)) { + && 0 != ut_dulint_cmp(trx->undo_no, + ut_dulint_zero)) { /* The trx may have modified the table. We block the use of the MySQL query cache @@ -3821,7 +3822,7 @@ lock_table_print( fputs("TABLE LOCK table ", file); ut_print_name(file, lock->un_member.tab_lock.table->name); fprintf(file, " trx id %lu %lu", - (lock->trx)->id.high, (lock->trx)->id.low); + (ulong) (lock->trx)->id.high, (ulong) (lock->trx)->id.low); if (lock_get_mode(lock) == LOCK_S) { fputs(" lock mode S", file); @@ -3834,7 +3835,7 @@ lock_table_print( } else if (lock_get_mode(lock) == LOCK_AUTO_INC) { fputs(" lock mode AUTO-INC", file); } else { - fprintf(file, " unknown lock mode %lu", lock_get_mode(lock)); + fprintf(file, " unknown lock mode %lu", (ulong) lock_get_mode(lock)); } if (lock_get_wait(lock)) { @@ -3868,10 +3869,12 @@ lock_rec_print( page_no = lock->un_member.rec_lock.page_no; fprintf(file, "RECORD LOCKS space id %lu page no %lu n bits %lu ", - space, page_no, lock_rec_get_n_bits(lock)); + (ulong) space, (ulong) page_no, + (ulong) lock_rec_get_n_bits(lock)); dict_index_name_print(file, lock->index); fprintf(file, " trx id %lu %lu", - (lock->trx)->id.high, (lock->trx)->id.low); + (ulong) (lock->trx)->id.high, + (ulong) (lock->trx)->id.low); if (lock_get_mode(lock) == LOCK_S) { fputs(" lock mode S", file); @@ -3907,7 +3910,7 @@ lock_rec_print( page = buf_page_get_gen(space, page_no, RW_NO_LATCH, NULL, BUF_GET_IF_IN_POOL, - IB__FILE__, __LINE__, &mtr); + __FILE__, __LINE__, &mtr); if (page) { page = buf_page_get_nowait(space, page_no, RW_S_LATCH, &mtr); @@ -3931,7 +3934,7 @@ lock_rec_print( if (lock_rec_get_nth_bit(lock, i)) { - fprintf(file, "Record lock, heap no %lu ", i); + fprintf(file, "Record lock, heap no %lu ", (ulong) i); if (page) { rec_print(file, @@ -4015,19 +4018,19 @@ lock_print_info( "------------\n", file); fprintf(file, "Trx id counter %lu %lu\n", - ut_dulint_get_high(trx_sys->max_trx_id), - ut_dulint_get_low(trx_sys->max_trx_id)); + (ulong) ut_dulint_get_high(trx_sys->max_trx_id), + (ulong) ut_dulint_get_low(trx_sys->max_trx_id)); fprintf(file, "Purge done for trx's n:o < %lu %lu undo n:o < %lu %lu\n", - ut_dulint_get_high(purge_sys->purge_trx_no), - ut_dulint_get_low(purge_sys->purge_trx_no), - ut_dulint_get_high(purge_sys->purge_undo_no), - ut_dulint_get_low(purge_sys->purge_undo_no)); + (ulong) ut_dulint_get_high(purge_sys->purge_trx_no), + (ulong) ut_dulint_get_low(purge_sys->purge_trx_no), + (ulong) ut_dulint_get_high(purge_sys->purge_undo_no), + (ulong) ut_dulint_get_low(purge_sys->purge_undo_no)); fprintf(file, "Total number of lock structs in row lock hash table %lu\n", - lock_get_n_rec_locks()); + (ulong) lock_get_n_rec_locks()); fprintf(file, "LIST OF TRANSACTIONS FOR EACH SESSION:\n"); @@ -4075,16 +4078,16 @@ loop: if (trx->read_view) { fprintf(file, "Trx read view will not see trx with id >= %lu %lu, sees < %lu %lu\n", - ut_dulint_get_high(trx->read_view->low_limit_id), - ut_dulint_get_low(trx->read_view->low_limit_id), - ut_dulint_get_high(trx->read_view->up_limit_id), - ut_dulint_get_low(trx->read_view->up_limit_id)); + (ulong) ut_dulint_get_high(trx->read_view->low_limit_id), + (ulong) ut_dulint_get_low(trx->read_view->low_limit_id), + (ulong) ut_dulint_get_high(trx->read_view->up_limit_id), + (ulong) ut_dulint_get_low(trx->read_view->up_limit_id)); } if (trx->que_state == TRX_QUE_LOCK_WAIT) { fprintf(file, "------- TRX HAS BEEN WAITING %lu SEC FOR THIS LOCK TO BE GRANTED:\n", - (ulint)difftime(time(NULL), trx->wait_started)); + (ulong)difftime(time(NULL), trx->wait_started)); if (lock_get_type(trx->wait_lock) == LOCK_REC) { lock_rec_print(file, trx->wait_lock); @@ -4374,7 +4377,7 @@ loop: rec = page_find_rec_with_heap_no(page, i); fprintf(stderr, - "Validating %lu %lu\n", space, page_no); + "Validating %lu %lu\n", (ulong) space, (ulong) page_no); lock_mutex_exit_kernel(); |