From 608b63c763689a239fcb26f8c82d64af676d0bda Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Mar 2005 12:45:08 +0100 Subject: sql/ha_innodb.cc protect prepare-...-commit with a mutex to ensure that commits in binlog and in the innodb have the same order store binlog position with the commit innobase/include/trx0trx.h: comment modified sql/ha_innodb.cc: protect prepare-...-commit with a mutex to ensure that commits in binlog and in the innodb have the same order store binlog position with the commit sql/handler.cc: ha_prepare cannot return -1 --- innobase/include/trx0trx.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'innobase/include') diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 9db69261468..64e9c87fbbd 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -390,8 +390,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 -- cgit v1.2.1