Commit e9a87395 authored by unknown's avatar unknown
Browse files

Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
parents 485e941e 1bc23847

sql/ha_ndbcluster.cc

+10 −23
Original line number Diff line number Diff line
@@ -540,13 +540,12 @@ bool ha_ndbcluster::get_error_message(int error, 
}





#ifndef DBUG_OFF

/*

  Check if type is supported by NDB.

  TODO Use this once in open(), not in every operation



*/



static inline bool ndb_supported_type(enum_field_types type)

static bool ndb_supported_type(enum_field_types type)

{

  switch (type) {

  case MYSQL_TYPE_TINY:
@@ -581,6 +580,7 @@ static inline bool ndb_supported_type(enum_field_types type) 
  }

  return FALSE;

}

#endif /* !DBUG_OFF */





/*
@@ -610,16 +610,11 @@ int ha_ndbcluster::set_ndb_key(NdbOperation *ndb_op, Field *field, 
                       pack_len));

  DBUG_DUMP("key", (char*)field_ptr, pack_len);

  

  if (ndb_supported_type(field->type()))

  {

    if (! (field->flags & BLOB_FLAG))

  DBUG_ASSERT(ndb_supported_type(field->type()));

  DBUG_ASSERT(! (field->flags & BLOB_FLAG));

  // Common implementation for most field types

  DBUG_RETURN(ndb_op->equal(fieldnr, (char*) field_ptr, pack_len) != 0);

}

  // Unhandled field types

  DBUG_PRINT("error", ("Field type %d not supported", field->type()));

  DBUG_RETURN(2);

}





/*
@@ -637,7 +632,7 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field, 
                       pack_len, field->is_null()?"Y":"N"));

  DBUG_DUMP("value", (char*) field_ptr, pack_len);



  if (ndb_supported_type(field->type()))

  DBUG_ASSERT(ndb_supported_type(field->type()));

  {

    // ndb currently does not support size 0

    uint32 empty_field;
@@ -715,9 +710,6 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field, 
    }

    DBUG_RETURN(1);

  }

  // Unhandled field types

  DBUG_PRINT("error", ("Field type %d not supported", field->type()));

  DBUG_RETURN(2);

}
@@ -813,8 +805,7 @@ int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field, 
  if (field != NULL)

  {

      DBUG_ASSERT(buf);

    if (ndb_supported_type(field->type()))

    {

      DBUG_ASSERT(ndb_supported_type(field->type()));

      DBUG_ASSERT(field->ptr != NULL);

      if (! (field->flags & BLOB_FLAG))

      {
@@ -846,10 +837,6 @@ int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field, 
      }

      DBUG_RETURN(1);

  }

    // Unhandled field types

    DBUG_PRINT("error", ("Field type %d not supported", field->type()));

    DBUG_RETURN(2);

  }



  // Used for hidden key only

  m_value[fieldnr].rec= ndb_op->getValue(fieldnr, NULL);