Commit e0274db3 authored by unknown's avatar unknown
Browse files

Don't need to scan exclusive since keyinfo is sent anyway

parent 7a8336be

ndb/test/ndbapi/testBlobs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ readScan(int style, bool idx) 
  } 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);

sql/ha_ndbcluster.cc

+1 −4
Original line number Diff line number Diff line
@@ -827,10 +827,7 @@ int ha_ndbcluster::get_ndb_lock_type(enum thr_lock_type type) 
  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;

}