1 files changed, 8 insertions, 35 deletions
diff --git a/ndb/include/ndbapi/NdbRecAttr.hpp b/ndb/include/ndbapi/NdbRecAttr.hpp
index 7eeff88671d..36b54035d96 100644
--- a/ndb/include/ndbapi/NdbRecAttr.hpp
+++ b/ndb/include/ndbapi/NdbRecAttr.hpp
@@ -18,10 +18,8 @@
 #define NdbRecAttr_H
 
 #include <NdbDictionary.hpp>
-#include "AttrType.hpp"
 
 class NdbOperation;
-class AttrInfo;
 
 /**
  * @class NdbRecAttr
@@ -78,20 +76,19 @@ class NdbRecAttr
   friend class NdbEventOperationImpl;
   friend class NdbScanReceiver;
   friend class Ndb;
-  
+  friend class NdbOut& operator<<(class NdbOut&, const class AttributeS&);
+
 public:
   /** 
    * @name Getting meta information
    * @{
    */
   const NdbDictionary::Column * getColumn() const;
-  
+
   /**
-   * Get attribute type.
-   * 
-   * @return Type of attribute: { Signed, UnSigned, Float, String }
+   * Get type of column
+   * @return Data type of the column
    */
-  AttrType attrType() const ;           
   NdbDictionary::Column::Type getType() const;
   
   /**
@@ -257,6 +254,7 @@ private:
   void next(NdbRecAttr* aRecAttr);
   NdbRecAttr* next() const;
 
+  int setup(const class NdbDictionary::Column* col, char* aValue);
   int setup(const class NdbColumnImpl* anAttrInfo, char* aValue);
                                 /* Set up attributes and buffers        */
   bool copyoutRequired() const; /* Need to copy data to application     */
@@ -317,33 +315,6 @@ NdbRecAttr::attrSize() const {
 }
 
 inline
-AttrType
-NdbRecAttr::attrType() const {
-  switch(getType()){
-  case NdbDictionary::Column::Bigint:
-  case NdbDictionary::Column::Int:
-    return Signed;
-  case NdbDictionary::Column::Bigunsigned:
-  case NdbDictionary::Column::Unsigned:
-    return UnSigned;
-  case NdbDictionary::Column::Float:
-  case NdbDictionary::Column::Decimal:
-  case NdbDictionary::Column::Double:
-    return Float;
-  case NdbDictionary::Column::Char:
-  case NdbDictionary::Column::Varchar:
-  case NdbDictionary::Column::Binary:
-  case NdbDictionary::Column::Varbinary:
-    return String;
-  case NdbDictionary::Column::Datetime:
-  case NdbDictionary::Column::Timespec:
-  case NdbDictionary::Column::Undefined:
-  default:
-    return NoAttrTypeDef;
-  }
-}
-
-inline
 Uint32
 NdbRecAttr::arraySize() const 
 {
@@ -505,5 +476,7 @@ NdbRecAttr::isNULL() const
   return theNULLind;
 }
 
+class NdbOut& operator <<(class NdbOut&, const NdbRecAttr &);
+
 #endif