bk commit into 4.1 tree (joreland:1.2050)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.1 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2050 04/10/05 13:51:32 joreland@stripped +2 -0
  Don't need to scan exclusive since keyinfo is sent anyway

  sql/ha_ndbcluster.cc
    1.91 04/10/05 13:51:29 joreland@stripped +1 -4
    Don't need to scan exclusive since keyinfo is sent anyway

  ndb/test/ndbapi/testBlobs.cpp
    1.13 04/10/05 13:51:29 joreland@stripped +1 -1
    Don't need to scan exclusive since keyinfo is sent anyway

# 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:	joreland
# Host:	eel.ndb.mysql.com
# Root:	/home/jonas/src/mysql-4.1-ndb

--- 1.12/ndb/test/ndbapi/testBlobs.cpp	Wed Sep 15 11:43:34 2004
+++ 1.13/ndb/test/ndbapi/testBlobs.cpp	Tue Oct  5 13:51:29 2004
@@ -1030,7 +1030,7 @@
   } else {
     CHK((g_ops = g_con->getNdbIndexScanOperation(g_opt.m_x2name, g_opt.m_tname)) != 0);
   }
-  CHK((rs = g_ops->readTuples(NdbScanOperation::LM_Exclusive)) != 0);
+  CHK((rs = g_ops->readTuples(NdbScanOperation::LM_Read)) != 0);
   CHK(g_ops->getValue("PK1", (char*)&tup.m_pk1) != 0);
   if (g_opt.m_pk2len != 0)
     CHK(g_ops->getValue("PK2", tup.m_pk2) != 0);

--- 1.90/sql/ha_ndbcluster.cc	Tue Oct  5 12:17:37 2004
+++ 1.91/sql/ha_ndbcluster.cc	Tue Oct  5 13:51:29 2004
@@ -827,10 +827,7 @@
   if (type == TL_WRITE_ALLOW_WRITE)
     return NdbOperation::LM_Exclusive;
   else if (uses_blob_value(retrieve_all_fields))
-    /*
-      TODO use a new scan mode to read + lock + keyinfo
-    */
-    return NdbOperation::LM_Exclusive;
+    return NdbOperation::LM_Read;
   else
     return NdbOperation::LM_CommittedRead;
 }