Commit e410532a authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main


sql/ha_ndbcluster.cc:
  Auto merged
parents 0343a80b 437afbfd

sql/ha_ndbcluster.cc

+6 −0
Original line number Diff line number Diff line
@@ -1364,6 +1364,12 @@ int ha_ndbcluster::unique_index_read(const byte *key, 
      m_value[i].ptr= NULL;

    }

  }

  if (table->primary_key == MAX_KEY) 

  {

    DBUG_PRINT("info", ("Getting hidden key"));

    if (get_ndb_value(op, NULL, i, NULL))

      ERR_RETURN(op->getNdbError());

  }



  if (execute_no_commit_ie(this,trans) != 0) 

  {