summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-03-16 17:13:43 +0100
committerserg@serg.mylan <>2005-03-16 17:13:43 +0100
commit19279b1b03a96374a9019829fc316feb72470716 (patch)
treee09235fb792bb6018de371bef2732acc5ead2a74 /innobase
parent357abac3a49b20ae30c7fe16549dd524a2fd4ba8 (diff)
parent99e581ecc1ee5537c918ef010ac92a27fa96944d (diff)
downloadmariadb-git-19279b1b03a96374a9019829fc316feb72470716.tar.gz
merged
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/trx0trx.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h
index 9db69261468..64e9c87fbbd 100644
--- a/innobase/include/trx0trx.h
+++ b/innobase/include/trx0trx.h
@@ -390,8 +390,9 @@ struct trx_struct{
dulint table_id; /* table id if the preceding field is
TRUE */
/*------------------------------*/
- int active_trans; /* whether a transaction in MySQL
- is active */
+ int active_trans; /* 1 - if a transaction in MySQL
+ is active. 2 - if prepare_commit_mutex
+ was taken */
void* mysql_thd; /* MySQL thread handle corresponding
to this trx, or NULL */
char** mysql_query_str;/* pointer to the field in mysqld_thd