bk commit into 5.1 tree (heikki:1.1986)

[Heikki Tuuri]

Below is the list of changes that have just been committed into a local
5.1 repository of heikki. When heikki 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
  1.1986 05/07/02 16:08:22 heikki@stripped +1 -0
  trx0trx.ic:
    Patched the bug fix of innodb_locks_unsafe_for binlog from 5.0 to this special 5.1 tree

  storage/innobase/include/trx0trx.ic
    1.5 05/07/02 16:08:06 heikki@stripped +10 -2
    Patched the bug fix of innodb_locks_unsafe_for binlog from 5.0 to this special 5.1 tree

# 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:	heikki
# Host:	hundin.mysql.fi
# Root:	/home/heikki/mysql-5.1-wl2325

--- 1.4/storage/innobase/include/trx0trx.ic	Sat Jul  2 16:00:31 2005
+++ 1.5/storage/innobase/include/trx0trx.ic	Sat Jul  2 16:08:06 2005
@@ -69,9 +69,17 @@
 		return;
 	}
 
-	ut_a(trx->new_rec_locks[1] == NULL);
+	if (trx->new_rec_locks[0] == index) {
 
-	trx->new_rec_locks[1] = index;
+		return;
+	}
+
+	if (trx->new_rec_locks[1] != NULL) {
+
+		return;
+	}
+ 
+ 	trx->new_rec_locks[1] = index;
 }
 
 /*****************************************************************