Merge a patch from MySQL AB (Mats Kindal):

Lock and unlock prepare_commit_mutex under the same conditions.

Merge a patch from MySQL AB (Mats Kindal):
Lock and unlock prepare_commit_mutex under the same conditions.
42a77e85 · marko · d475256c · 42a77e85
Commit 42a77e85 authored Aug 22, 2006 by marko
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/handler/ha_innodb.cc
+++ b/handler/ha_innodb.cc
@@ -7396,7 +7396,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