mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge
ndb/include/ndbapi/Ndb.hpp: Auto merged ndb/include/ndbapi/NdbConnection.hpp: Auto merged ndb/include/ndbapi/NdbIndexOperation.hpp: Auto merged ndb/Epilogue.mk_old: Auto merged ndb/src/common/debugger/signaldata/Makefile_old: Auto merged ndb/src/common/mgmcommon/Makefile_old: Auto merged ndb/src/common/util/Makefile_old: Auto merged ndb/src/kernel/Makefile_old: Auto merged ndb/src/kernel/ndb-main/Main.cpp: Auto merged ndb/src/kernel/ndb-main/Makefile_old: Auto merged ndb/src/kernel/vm/Makefile_old: Auto merged ndb/src/mgmapi/Makefile_old: Auto merged ndb/src/mgmclient/Makefile_old: Auto merged ndb/src/mgmsrv/Makefile_old: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/ClusterMgr.cpp: Auto merged ndb/src/ndbapi/Makefile_old: Auto merged ndb/src/ndbapi/Ndb.cpp: Auto merged ndb/src/ndbapi/NdbApiSignal.cpp: Auto merged ndb/src/ndbapi/NdbConnection.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged ndb/src/ndbapi/NdbIndexOperation.cpp: Auto merged ndb/src/ndbapi/NdbOperation.cpp: Auto merged ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged ndb/src/ndbapi/NdbOperationExec.cpp: Auto merged ndb/src/ndbapi/NdbOperationInt.cpp: Auto merged ndb/src/ndbapi/Ndbinit.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.hpp: Auto merged ndb/test/ndbapi/Makefile_old: Auto merged ndb/test/ndbapi/ScanFunctions.hpp: Auto merged ndb/test/ndbapi/ScanInterpretTest.hpp: Auto merged ndb/test/ndbapi/testDataBuffers.cpp: Auto merged ndb/test/ndbapi/old_dirs/testBackup/Makefile: Auto merged ndb/test/ndbapi/old_dirs/testGrep/Makefile: Auto merged ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile: Auto merged ndb/test/ndbapi/testDict.cpp: Auto merged ndb/test/ndbapi/testGrep.cpp: Auto merged ndb/test/ndbapi/testIndex.cpp: Auto merged ndb/test/ndbapi/testOIBasic.cpp: Auto merged ndb/test/ndbapi/testSystemRestart.cpp: Auto merged ndb/test/ndbapi/testTimeout.cpp: Auto merged ndb/test/src/Makefile_old: Auto merged ndb/test/src/UtilTransactions.cpp: Auto merged ndb/test/tools/create_index.cpp: Auto merged ndb/tools/select_all.cpp: Auto merged
This commit is contained in:
@ -74,8 +74,9 @@ class AttrInfo;
|
||||
class NdbRecAttr
|
||||
{
|
||||
friend class NdbOperation;
|
||||
friend class NdbIndexScanOperation;
|
||||
friend class NdbEventOperationImpl;
|
||||
friend class NdbScanReceiver;
|
||||
friend class NdbReceiver;
|
||||
friend class Ndb;
|
||||
|
||||
public:
|
||||
@ -244,9 +245,8 @@ private:
|
||||
NdbRecAttr();
|
||||
|
||||
Uint32 attrId() const; /* Get attribute id */
|
||||
void setNULL(); /* Set NULL indicator */
|
||||
void setNotNULL(); /* Set Not NULL indicator */
|
||||
void setUNDEFINED(); /* Set UNDEFINED indicator */
|
||||
bool setNULL(); /* Set NULL indicator */
|
||||
bool receive_data(const Uint32*, Uint32);
|
||||
|
||||
void release(); /* Release memory if allocated */
|
||||
void init(); /* Initialise object when allocated */
|
||||
@ -254,6 +254,7 @@ private:
|
||||
void next(NdbRecAttr* aRecAttr);
|
||||
NdbRecAttr* next() const;
|
||||
|
||||
|
||||
int setup(const class NdbColumnImpl* anAttrInfo, char* aValue);
|
||||
/* Set up attributes and buffers */
|
||||
bool copyoutRequired() const; /* Need to copy data to application */
|
||||
@ -268,6 +269,7 @@ private:
|
||||
Uint32 theAttrId; /* The attribute id */
|
||||
|
||||
int theNULLind;
|
||||
bool m_nullable;
|
||||
Uint32 theAttrSize;
|
||||
Uint32 theArraySize;
|
||||
const NdbDictionary::Column* m_column;
|
||||
@ -288,29 +290,7 @@ NdbRecAttr::getColumn() const {
|
||||
inline
|
||||
Uint32
|
||||
NdbRecAttr::attrSize() const {
|
||||
|
||||
switch(getType()){
|
||||
case NdbDictionary::Column::Int:
|
||||
case NdbDictionary::Column::Unsigned:
|
||||
case NdbDictionary::Column::Float:
|
||||
return 4;
|
||||
case NdbDictionary::Column::Decimal:
|
||||
case NdbDictionary::Column::Char:
|
||||
case NdbDictionary::Column::Varchar:
|
||||
case NdbDictionary::Column::Binary:
|
||||
case NdbDictionary::Column::Varbinary:
|
||||
return 1;
|
||||
case NdbDictionary::Column::Bigint:
|
||||
case NdbDictionary::Column::Bigunsigned:
|
||||
case NdbDictionary::Column::Double:
|
||||
case NdbDictionary::Column::Datetime:
|
||||
return 8;
|
||||
case NdbDictionary::Column::Timespec:
|
||||
return 12;
|
||||
case NdbDictionary::Column::Undefined:
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
return theAttrSize;
|
||||
}
|
||||
|
||||
inline
|
||||
@ -448,24 +428,11 @@ NdbRecAttr::attrId() const
|
||||
}
|
||||
|
||||
inline
|
||||
void
|
||||
bool
|
||||
NdbRecAttr::setNULL()
|
||||
{
|
||||
theNULLind = 1;
|
||||
}
|
||||
|
||||
inline
|
||||
void
|
||||
NdbRecAttr::setNotNULL()
|
||||
{
|
||||
theNULLind = 0;
|
||||
}
|
||||
|
||||
inline
|
||||
void
|
||||
NdbRecAttr::setUNDEFINED()
|
||||
{
|
||||
theNULLind = -1;
|
||||
return m_nullable;
|
||||
}
|
||||
|
||||
inline
|
||||
|
Reference in New Issue
Block a user