Commit 421907e9 authored by unknown's avatar unknown
Browse files

Merge 


BitKeeper/etc/logging_ok:
  auto-union
innobase/include/trx0trx.h:
  Auto merged
innobase/trx/trx0trx.c:
  SCCS merged
parents 9f47e08e 7656b6da

innobase/include/trx0trx.h

+6 −0
Original line number Diff line number Diff line
@@ -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