summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2005-03-21 22:29:02 +0200
committerunknown <heikki@hundin.mysql.fi>2005-03-21 22:29:02 +0200
commit87110734d334b89f95323980f080b265e38810bf (patch)
treee62a1ed583fd0bd839b4c7b4a69a314b9967e0ab /innobase/include
parentd15dd012cd5ea2d20cdf634844917dd9dc77c198 (diff)
parent6d0d2c7e1d942f95b4f29645ef5007c43da56f79 (diff)
downloadmariadb-git-87110734d334b89f95323980f080b265e38810bf.tar.gz
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0 BitKeeper/etc/logging_ok: auto-union include/config-netware.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/trx/trx0trx.c: Auto merged
Diffstat (limited to 'innobase/include')
-rw-r--r--innobase/include/trx0trx.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h
index 9db69261468..4adfb4aedaf 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