diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-03-01 08:17:03 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-03-01 08:17:03 +0200 |
| commit | ea24940fbaa9f4e55f41843c2441fad7c2af5689 (patch) | |
| tree | 86f1e3f4fc1565ef7597f6d0135662c8af203012 /sql/ha_innodb.cc | |
| parent | 108702a34e37bae22f117a3a7e18e7cead3e63c8 (diff) | |
| download | mariadb-git-ea24940fbaa9f4e55f41843c2441fad7c2af5689.tar.gz | |
Fixed XA recovery for InnoDB. Note that XA recovery is still disabled
until it has been comprehensive tested.
innobase/log/log0log.c:
Added general documentation of InnoDB redo-logs.
innobase/trx/trx0roll.c:
Prepared transactions are not rolled back in a recovery if
innobase_force_recovery = 0. But they are rolled back if
innobase_force_recovery > 0.
innobase/trx/trx0trx.c:
Disable the XA code in InnoDB crash recovery until it has been
comprehensive tested. SHOW INNODB STATUS now prints different
output for prepared transactions.
innobase/trx/trx0undo.c:
Do not unnecessary write X/Open XA XID. XID is written in the prepare.
Space for a XID should be reserved at this stage.
sql/ha_innodb.cc:
Remove error.
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index f68ad99ac44..b733af7774e 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -3071,9 +3071,6 @@ ha_innobase::unlock_row(void) DBUG_ENTER("ha_innobase::unlock_row"); - ut_ad(prebuilt->trx == - (trx_t*) current_thd->transaction.all.innobase_tid); - if (last_query_id != user_thd->query_id) { ut_print_timestamp(stderr); fprintf(stderr, |