bk commit into 5.1 tree (mkindahl:1.2253) BUG#21833

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-25 16:50:01+02:00, mkindahl@stripped +1 -0
  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.

  sql/ha_innodb.cc@stripped, 2006-08-25 16:49:50+02:00, mkindahl@stripped +3 -1
    Adding condition to release and aquire mutex under same conditions.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mkindahl
# Host:	dl145h.mysql.com
# Root:	/users/mkindahl/mysql-5.1-new-rpl

--- 1.283/sql/ha_innodb.cc	2006-08-25 16:50:19 +02:00
+++ 1.284/sql/ha_innodb.cc	2006-08-25 16:50:19 +02:00
@@ -7387,7 +7387,9 @@
 	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