BUG#21833 (Prepare_commit_mutex not locked and unlocked under same condition):

Adding condition to ensure that mutex are locked and unlocked under same condition.

BUG#21833 (Prepare_commit_mutex not locked and unlocked under same condition):
Adding condition to ensure that mutex are locked and unlocked under same condition.
e49db547 · mkindahl@dl145h.mysql.com · 0b7dc268 · e49db547
Commit e49db547 authored Aug 25, 2006 by mkindahl@dl145h.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/ha_innodb.cc sql/ha_innodb.cc +3 -1

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -7387,7 +7387,9 @@ innobase_xa_prepare(
 	int error = 0;
 	trx_t* trx = check_trx_exists(thd);
-	if (thd->lex->sql_command != SQLCOM_XA_PREPARE) {
+	if (thd->lex->sql_command != SQLCOM_XA_PREPARE &&
+	    (all || !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))))
+	{
 		/* For ibbackup to work the order of transactions in binlog
 		and InnoDB must be the same. Consider the situation