summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2005-03-21 22:14:00 +0200
committerunknown <heikki@hundin.mysql.fi>2005-03-21 22:14:00 +0200
commit4adbc670270b94243efa4839f6a85011b1b8ec7a (patch)
tree90f0ba5ad9fc0380f10cfd1094b2dc7f6ed51695 /innobase/include
parentab901d1803ba26f02e8f3085e2a5b8ce478e6c22 (diff)
parenta422f163c16384678ad8f30cefade5495b253a68 (diff)
downloadmariadb-git-4adbc670270b94243efa4839f6a85011b1b8ec7a.tar.gz
Merge
BitKeeper/etc/logging_ok: auto-union innobase/include/trx0trx.h: Auto merged innobase/trx/trx0trx.c: SCCS 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 8336e05bdb0..905b25447a8 100644
--- a/innobase/include/trx0trx.h
+++ b/innobase/include/trx0trx.h
@@ -346,6 +346,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