diff options
| author | unknown <serg@serg.mylan> | 2005-03-16 17:13:43 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-16 17:13:43 +0100 |
| commit | 1f919052319d8e6d2a85f3ac0ba84084014eb525 (patch) | |
| tree | e09235fb792bb6018de371bef2732acc5ead2a74 /innobase/include | |
| parent | 01774e960b2c8998372d9b61515f8a1f5357847b (diff) | |
| parent | 608b63c763689a239fcb26f8c82d64af676d0bda (diff) | |
| download | mariadb-git-1f919052319d8e6d2a85f3ac0ba84084014eb525.tar.gz | |
merged
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/trx0trx.h | 5 |
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 |