diff options
| author | unknown <patg@patrick.local> | 2005-04-01 12:32:17 -0800 |
|---|---|---|
| committer | unknown <patg@patrick.local> | 2005-04-01 12:32:17 -0800 |
| commit | c0333ecee42a4de499b3377cfa21d7b5af1ddd2b (patch) | |
| tree | 389228d07d324be3e962fefab032b134daa8021a /innobase/include/trx0trx.h | |
| parent | 844acf9a66bb85ea0604f385efdaf2c655fd957a (diff) | |
| parent | bd2da82b2131241ce960bb02075aba2689ed1a3a (diff) | |
| download | mariadb-git-c0333ecee42a4de499b3377cfa21d7b5af1ddd2b.tar.gz | |
5.0 to 5.1 merge
mysql-test/r/grant.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
configure.in:
merge of 5.0 to 5.1, version info and NDB_VERSION_() conflicts
libmysqld/Makefile.am:
merge of Makefile sql_sources list
sql/sql_acl.h:
merge, no need to hand resolve
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'innobase/include/trx0trx.h')
| -rw-r--r-- | innobase/include/trx0trx.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 9db69261468..d46613c3a68 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -381,6 +381,12 @@ struct trx_struct{ in MySQL's binlog write, we will flush the log to disk later in a separate call */ + ibool must_flush_log_later;/* this flag is set to TRUE in + trx_commit_off_kernel() if + flush_log_later was TRUE, and there + were modifications by the transaction; + in that case we must flush the log + in trx_commit_complete_for_mysql() */ dulint commit_lsn; /* lsn at the time of the commit */ ibool dict_operation; /* TRUE if the trx is used to create a table, create an index, or drop a @@ -390,8 +396,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 |