diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-08-03 17:09:21 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-08-03 17:09:21 +0300 |
| commit | a8bb376fc7ecc3e26623c897c4ec99739a3d1a29 (patch) | |
| tree | aedea677efe6043e724f01c1c14864393d62c931 /innobase/trx | |
| parent | acc423865419b1b9269b4e4777a27b431526d9da (diff) | |
| download | mariadb-git-a8bb376fc7ecc3e26623c897c4ec99739a3d1a29.tar.gz | |
Many files:
Push the patch of Jan Lindstrom: better comments
ha_innodb.cc:
Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction
sql/ha_innodb.cc:
Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction
sql/ha_innodb.h:
Push the patch of Jan Lindstrom: better comments
innobase/trx/trx0trx.c:
Push the patch of Jan Lindstrom: better comments
innobase/srv/srv0srv.c:
Push the patch of Jan Lindstrom: better comments
innobase/srv/srv0start.c:
Push the patch of Jan Lindstrom: better comments
innobase/row/row0sel.c:
Push the patch of Jan Lindstrom: better comments
innobase/read/read0read.c:
Push the patch of Jan Lindstrom: better comments
innobase/include/read0read.h:
Push the patch of Jan Lindstrom: better comments
innobase/include/trx0trx.h:
Push the patch of Jan Lindstrom: better comments
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0trx.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index f95491443ee..1681bed9af2 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -833,26 +833,14 @@ trx_commit_off_kernel( lock_release_off_kernel(trx); - if (trx->read_view) { - /* If transaction has a global read view this case - means that transaction has been using a consistent - read view associated to a cursor. Only the global - read view associated to a transaction is closed - and read view is then removed from the transaction. - If read view associated to a cursor is still used - it must be re-registered to another transaction. */ - - if (UNIV_LIKELY_NULL(trx->global_read_view)) { - trx->read_view = trx->global_read_view; - } - - read_view_close(trx->read_view); - + if (trx->global_read_view) { + read_view_close(trx->global_read_view); mem_heap_empty(trx->global_read_view_heap); - trx->read_view = NULL; trx->global_read_view = NULL; } + trx->read_view = NULL; + if (must_flush_log) { mutex_exit(&kernel_mutex); |