diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-12-25 15:42:33 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-12-25 15:42:33 +0100 |
| commit | 34a48dd4a0488934ea80d5e113484ab6aaa902f8 (patch) | |
| tree | cbd232de0b6a097e66f20f8052ba06d3c516d1a8 /storage/xtradb/include/trx0trx.h | |
| parent | b3c72b9a02e570a4a66ca0a64e94fe1116976c85 (diff) | |
| parent | a2d921be3634ceff4ab4c67f57b27a481d4a28df (diff) | |
| download | mariadb-git-34a48dd4a0488934ea80d5e113484ab6aaa902f8.tar.gz | |
Merge MWL#116 into mariadb-5.2-rpl.
Diffstat (limited to 'storage/xtradb/include/trx0trx.h')
| -rw-r--r-- | storage/xtradb/include/trx0trx.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/storage/xtradb/include/trx0trx.h b/storage/xtradb/include/trx0trx.h index 4c0ce392bcd..36f9c464c2b 100644 --- a/storage/xtradb/include/trx0trx.h +++ b/storage/xtradb/include/trx0trx.h @@ -511,9 +511,10 @@ struct trx_struct{ in that case we must flush the log in trx_commit_complete_for_mysql() */ ulint duplicates; /*!< TRX_DUP_IGNORE | TRX_DUP_REPLACE */ - ulint active_trans; /*!< 1 - if a transaction in MySQL - is active. 2 - if prepare_commit_mutex - was taken */ + ulint active_trans; /*!< TRX_ACTIVE_IN_MYSQL - set if a + transaction in MySQL is active. + TRX_ACTIVE_COMMIT_ORDERED - set if + innobase_commit_ordered has run */ ulint has_search_latch; /* TRUE if this trx has latched the search system latch in S-mode */ @@ -824,6 +825,10 @@ Multiple flags can be combined with bitwise OR. */ #define TRX_SIG_OTHER_SESS 1 /* sent by another session (which must hold rights to this) */ +/* Flag bits for trx_struct.active_trans */ +#define TRX_ACTIVE_IN_MYSQL (1<<0) +#define TRX_ACTIVE_COMMIT_ORDERED (1<<1) + /** Commit node states */ enum commit_node_state { COMMIT_NODE_SEND = 1, /*!< about to send a commit signal to |