Commit f617f4f1 authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
parents c09f3a22 dc3c5470

storage/ndb/include/ndbapi/NdbRecAttr.hpp

+0 −14
Original line number Diff line number Diff line
@@ -301,13 +301,6 @@ NdbRecAttr::int32_value() const 
  return *(Int32*)theRef;

}



inline

Int32

NdbRecAttr::medium_value() const

{

  return sint3korr((unsigned char *)theRef);

}



inline

short

NdbRecAttr::short_value() const
@@ -329,13 +322,6 @@ NdbRecAttr::u_32_value() const 
  return *(Uint32*)theRef;

}



inline

Uint32

NdbRecAttr::u_medium_value() const

{

  return uint3korr((unsigned char*)theRef);

}



inline

Uint16

NdbRecAttr::u_short_value() const

storage/ndb/src/ndbapi/NdbRecAttr.cpp

+12 −0
Original line number Diff line number Diff line
@@ -517,3 +517,15 @@ NdbRecAttr::double_value() const 
  memcpy(&val,theRef,sizeof(val));

  return val;

}



Int32

NdbRecAttr::medium_value() const

{

  return sint3korr((unsigned char *)theRef);

}



Uint32

NdbRecAttr::u_medium_value() const

{

  return uint3korr((unsigned char*)theRef);

}