summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-03-22 16:11:43 +0100
committerunknown <serg@serg.mylan>2005-03-22 16:11:43 +0100
commite31642727b405e83ed0512a6c3318869f2a31e0c (patch)
treecb3fd62572918eb80e7c2add26636565c33ecace /innobase/include
parent82182de38722242c3ec5c6b7d77bdbfe271b4bc5 (diff)
parent6ed02debff53e895e6c526fbbeac7c791e1f269f (diff)
downloadmariadb-git-e31642727b405e83ed0512a6c3318869f2a31e0c.tar.gz
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0 innobase/include/trx0trx.h: Auto merged sql/ha_innodb.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: 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 64e9c87fbbd..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