1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into hundin.mysql.fi:/home/heikki/mysql-5.0
This commit is contained in:
unknown 2005-02-22 16:20:47 +02:00
commit 3bd16c794e
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
innobase/trx/trx0trx.c
View File

@ -434,7 +434,19 @@ trx_lists_init_at_db_start(void)
commit or abort decision from MySQL */ commit or abort decision from MySQL */
if (undo->state == TRX_UNDO_PREPARED) { if (undo->state == TRX_UNDO_PREPARED) {
trx->conc_state = TRX_PREPARED;
fprintf(stderr,
"InnoDB: Transaction %lu %lu was in the XA prepared state. We change it to\n"
"InnoDB: the 'active' state, so that InnoDB's true-and-tested crash\n"
"InnoDB: recovery will roll it back. If mysqld refuses to start after\n"
"InnoDB: this, you may be able to resolve the problem by moving the binlog\n"
"InnoDB: files to a safe place, and deleting all binlog files and the binlog\n"
"InnoDB: .index file from the datadir.\n", ut_dulint_get_high(trx->id),
ut_dulint_get_low(trx->id));
/* trx->conc_state = TRX_PREPARED; */
trx->conc_state =
TRX_ACTIVE;
} else { } else {
trx->conc_state = trx->conc_state =
TRX_COMMITTED_IN_MEMORY; TRX_COMMITTED_IN_MEMORY;
@ -490,8 +502,20 @@ trx_lists_init_at_db_start(void)
commit or abort decision from MySQL */ commit or abort decision from MySQL */
if (undo->state == TRX_UNDO_PREPARED) { if (undo->state == TRX_UNDO_PREPARED) {
fprintf(stderr,
"InnoDB: Transaction %lu %lu was in the XA prepared state. We change it to\n"
"InnoDB: the 'active' state, so that InnoDB's true-and-tested crash\n"
"InnoDB: recovery will roll it back. If mysqld refuses to start after\n"
"InnoDB: this, you may be able to resolve the problem by moving the binlog\n"
"InnoDB: files to a safe place, and deleting all binlog files and the binlog\n"
"InnoDB: .index file from the datadir.\n", ut_dulint_get_high(trx->id),
ut_dulint_get_low(trx->id));
/* trx->conc_state = TRX_PREPARED; */
trx->conc_state = trx->conc_state =
TRX_PREPARED; TRX_ACTIVE;
} else { } else {
trx->conc_state = trx->conc_state =
TRX_COMMITTED_IN_MEMORY; TRX_COMMITTED_IN_MEMORY;