mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge
BitKeeper/deleted/.del-Epilogue.mk~60f7edf886726154: Auto merged BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged ndb/src/kernel/Main.cpp: Auto merged
This commit is contained in:
@ -20,7 +20,6 @@
|
||||
#include <NdbDictionary.hpp>
|
||||
|
||||
class NdbOperation;
|
||||
class AttrInfo;
|
||||
|
||||
/**
|
||||
* @class NdbRecAttr
|
||||
@ -78,7 +77,8 @@ class NdbRecAttr
|
||||
friend class NdbEventOperationImpl;
|
||||
friend class NdbReceiver;
|
||||
friend class Ndb;
|
||||
|
||||
friend class NdbOut& operator<<(class NdbOut&, const class AttributeS&);
|
||||
|
||||
public:
|
||||
/**
|
||||
* @name Getting meta information
|
||||
@ -254,7 +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 */
|
||||
@ -442,5 +442,7 @@ NdbRecAttr::isNULL() const
|
||||
return theNULLind;
|
||||
}
|
||||
|
||||
class NdbOut& operator <<(class NdbOut&, const NdbRecAttr &);
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user