diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-12-01 09:20:32 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-12-01 09:20:32 +0200 |
| commit | 843f38fc780e2aae7017c5696f025e7afb9adca3 (patch) | |
| tree | 48e808442675c1b10109d7f02d3521fbdfb2e4cd /innobase/include | |
| parent | 739b630ed7c1a832ff4e8075cd8739c93286e61f (diff) | |
| download | mariadb-git-843f38fc780e2aae7017c5696f025e7afb9adca3.tar.gz | |
This is a code cleanup patch for X/Open XA.
BitKeeper/deleted/.del-xa.h~4021d7e61ff515b:
Delete: innobase/include/xa.h
innobase/include/trx0trx.h:
Change xa.h to trx0ha.h.
innobase/include/trx0undo.h:
Split TRX_UNDO_DICT_OPERATION field to two fiels: first contains
TRX_UNDO_XID_EXISTS flag which is TRUE if log header contains
X/Open XA XID and the second one contains TRX_UNDO_DICT_TRANS
flag which is TRUE if the transaction is dictionary transaction.
innobase/trx/trx0trx.c:
Remove unnecessary and erroneus code from prepare. Add some
informative printouts of prepared transactions.
innobase/trx/trx0undo.c:
Split TRX_UNDO_DICT_OPERATION field to two fields: the first field
is TRX_UNDO_XID_EXISTS flag which is true if the log header contains
X/Open XA XID and the second field is TRX_UNDO_DICT_TRANS flag
which is true if the transaction was a dictionary transaction.
sql/ha_innodb.cc:
Code cleanup.
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/trx0trx.h | 2 | ||||
| -rw-r--r-- | innobase/include/trx0undo.h | 8 | ||||
| -rw-r--r-- | innobase/include/trx0xa.h (renamed from innobase/include/xa.h) | 0 |
3 files changed, 6 insertions, 4 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 8a16fa82057..8eb71dac763 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -16,7 +16,7 @@ Created 3/26/1996 Heikki Tuuri #include "que0types.h" #include "mem0mem.h" #include "read0types.h" -#include "xa.h" +#include "trx0xa.h" extern ulint trx_n_mysql_transactions; diff --git a/innobase/include/trx0undo.h b/innobase/include/trx0undo.h index 5aecada05d8..fce62e46046 100644 --- a/innobase/include/trx0undo.h +++ b/innobase/include/trx0undo.h @@ -14,7 +14,7 @@ Created 3/26/1996 Heikki Tuuri #include "mtr0mtr.h" #include "trx0sys.h" #include "page0types.h" -#include "xa.h" +#include "trx0xa.h" /*************************************************************************** Builds a roll pointer dulint. */ @@ -469,7 +469,10 @@ page of an update undo log segment. */ log start, and therefore this is not necessarily the same as this log header end offset */ -#define TRX_UNDO_DICT_OPERATION 20 /* TRUE if the transaction is a table +#define TRX_UNDO_XID_EXISTS 20 /* TRUE if undo log header includes + X/Open XA transaction identification + XID */ +#define TRX_UNDO_DICT_TRANS 21 /* TRUE if the transaction is a table create, index create, or drop transaction: in recovery the transaction cannot be rolled back @@ -492,7 +495,6 @@ page of an update undo log segment. */ #define TRX_UNDO_XA_BQUAL_LEN (TRX_UNDO_XA_TRID_LEN + 4) #define TRX_UNDO_XA_XID (TRX_UNDO_XA_BQUAL_LEN + 4) #define TRX_UNDO_XA_LEN (TRX_UNDO_XA_XID + XIDDATASIZE) -#define TRX_UNDO_XA_EXISTS 256 /*-------------------------------------------------------------*/ #define TRX_UNDO_LOG_HDR_SIZE (TRX_UNDO_XA_LEN) diff --git a/innobase/include/xa.h b/innobase/include/trx0xa.h index c1ecd3cc1e7..c1ecd3cc1e7 100644 --- a/innobase/include/xa.h +++ b/innobase/include/trx0xa.h |