database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca

Browse Source 
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
This commit is contained in:
knielsen@loke.(none)
2007-10-25 10:48:42 +02:00
parent d850b107b7 815a63008c
commit 328fc573e4
5 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/ndb/include/kernel/AttributeHeader.hpp
View File

@@ -52,8 +52,7 @@ public:
// NOTE: in 5.1 ctors and init take size in bytes
/** Initialize AttributeHeader at location aHeaderPtr */
static AttributeHeader& init(void* aHeaderPtr, Uint32 anAttributeId,
Uint32 aByteSize);
static void init(Uint32* aHeaderPtr, Uint32 anAttributeId, Uint32 aByteSize);
/** Returns size of AttributeHeader (usually one or two words) */
Uint32 getHeaderSize() const; // In 32-bit words
@@ -113,10 +112,11 @@ public:
*/
inline
AttributeHeader& AttributeHeader::init(void* aHeaderPtr, Uint32 anAttributeId,
Uint32 aByteSize)
void AttributeHeader::init(Uint32* aHeaderPtr, Uint32 anAttributeId,
Uint32 aByteSize)
{
return * new (aHeaderPtr) AttributeHeader(anAttributeId, aByteSize);
AttributeHeader ah(anAttributeId, aByteSize);
*aHeaderPtr = ah.m_value;
}
inline