From: jonas
Date: October 19 2006 7:28am
Subject: bk commit into 5.0 tree (jonas:1.2261) BUG#23200
List-Archive: http://lists.mysql.com/commits/13938
X-Bug: 23200
Message-Id: <20061019072802.1836E598679@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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-10-19 09:27:58+02:00, jonas@stripped +1 -0
  ndb - bug#23200
    this changes lock taken during peek, to decrease likelyhood of transaction abort
    

  sql/ha_ndbcluster.cc@stripped, 2006-10-19 09:27:57+02:00, jonas@stripped +3 -1
    use exclusive lock in peek, as peek is used just before insert/update

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/50-work

--- 1.274/sql/ha_ndbcluster.cc	2006-10-19 09:28:02 +02:00
+++ 1.275/sql/ha_ndbcluster.cc	2006-10-19 09:28:02 +02:00
@@ -1588,7 +1588,9 @@
   int res;
   DBUG_ENTER("peek_indexed_rows");
 
-  NdbOperation::LockMode lm= NdbOperation::LM_Read;
+  NdbOperation::LockMode lm=
+    (NdbOperation::LockMode)get_ndb_lock_type(m_lock.type);
+  
   first= NULL;
   if (table->s->primary_key != MAX_KEY)
   {