diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-06-21 07:36:18 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-06-21 07:36:18 +0300 |
| commit | 2fb07495ed6aded3a3c9bdbd9456bbe692362bc2 (patch) | |
| tree | 767c26a535c75a55034463ff090808d95891c741 /innobase/trx | |
| parent | c2e9730818d9b4a3aa2c237085d3cd41e3001414 (diff) | |
| parent | 3236060592757ec84b4abcd9e617009dd68555e1 (diff) | |
| download | mariadb-git-2fb07495ed6aded3a3c9bdbd9456bbe692362bc2.tar.gz | |
Merge hundin.mysql.fi:/home/marko/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0rec.c | 4 | ||||
| -rw-r--r-- | innobase/trx/trx0roll.c | 2 | ||||
| -rw-r--r-- | innobase/trx/trx0trx.c | 10 |
3 files changed, 4 insertions, 12 deletions
diff --git a/innobase/trx/trx0rec.c b/innobase/trx/trx0rec.c index fcb7582ce73..3f3cfd3b000 100644 --- a/innobase/trx/trx0rec.c +++ b/innobase/trx/trx0rec.c @@ -1134,7 +1134,7 @@ trx_undo_report_row_operation( mutex_exit(&(trx->undo_mutex)); mtr_commit(&mtr); - if (heap) { + if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); } return(DB_OUT_OF_FILE_SPACE); @@ -1153,7 +1153,7 @@ trx_undo_report_row_operation( *roll_ptr = trx_undo_build_roll_ptr(is_insert, rseg->id, page_no, offset); - if (heap) { + if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); } return(DB_SUCCESS); diff --git a/innobase/trx/trx0roll.c b/innobase/trx/trx0roll.c index 69f7a99187f..fdfb7428129 100644 --- a/innobase/trx/trx0roll.c +++ b/innobase/trx/trx0roll.c @@ -1237,10 +1237,12 @@ trx_finish_rollback_off_kernel( return; } +#ifdef UNIV_DEBUG if (lock_print_waits) { fprintf(stderr, "Trx %lu rollback finished\n", (ulong) ut_dulint_get_low(trx->id)); } +#endif /* UNIV_DEBUG */ trx_commit_off_kernel(trx); diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index c6d1f953772..9e155ee1de0 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -158,8 +158,6 @@ trx_create( trx->n_tickets_to_enter_innodb = 0; trx->auto_inc_lock = NULL; - trx->n_lock_table_exp = 0; - trx->n_lock_table_transactional = 0; trx->read_view_heap = mem_heap_create(256); trx->read_view = NULL; @@ -309,8 +307,6 @@ trx_free( ut_a(!trx->has_search_latch); ut_a(!trx->auto_inc_lock); - ut_a(!trx->n_lock_table_exp); - ut_a(!trx->n_lock_table_transactional); ut_a(trx->dict_operation_lock_mode == 0); @@ -1711,12 +1707,6 @@ trx_print( (ulong) trx->mysql_n_tables_locked); } - if (trx->n_lock_table_transactional > 0 || trx->n_lock_table_exp > 0) { -fprintf(f, "mysql explicit table locks %lu, transactional table locks %lu\n", - (ulong) trx->n_lock_table_exp, - (ulong) trx->n_lock_table_transactional); - } - newline = TRUE; switch (trx->que_state) { |