diff options
| author | unknown <joreland@mysql.com> | 2004-11-15 11:21:21 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-15 11:21:21 +0100 |
| commit | 9d16201f2dcc3b68fd18765bb0b52a1f1816a79b (patch) | |
| tree | 8c7ba249167ef6dd206b09dade93ed923544851c /ndb/src/ndbapi/NdbDictionaryImpl.hpp | |
| parent | 2efdf76554350a22c552f51e7aa77c50865ba820 (diff) | |
| parent | 32f4f5ce55c84bf6ef3c0432adfe6d38bda03774 (diff) | |
| download | mariadb-git-9d16201f2dcc3b68fd18765bb0b52a1f1816a79b.tar.gz | |
merge
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbDictionaryImpl.hpp')
| -rw-r--r-- | ndb/src/ndbapi/NdbDictionaryImpl.hpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/ndb/src/ndbapi/NdbDictionaryImpl.hpp index 62d2a951f28..38477e95d99 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.hpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.hpp @@ -63,12 +63,8 @@ public: CHARSET_INFO * m_cs; // not const in MySQL bool m_pk; - bool m_tupleKey; bool m_distributionKey; - bool m_distributionGroup; - int m_distributionGroupBits; bool m_nullable; - bool m_indexOnly; bool m_autoIncrement; Uint64 m_autoIncrementInitialValue; BaseString m_defaultValue; @@ -128,8 +124,8 @@ public: int m_kvalue; int m_minLoadFactor; int m_maxLoadFactor; - int m_keyLenInWords; - int m_fragmentCount; + Uint16 m_keyLenInWords; + Uint16 m_fragmentCount; NdbDictionaryImpl * m_dictionary; NdbIndexImpl * m_index; @@ -147,9 +143,9 @@ public: /** * Aggregates */ - Uint32 m_noOfKeys; - unsigned short m_sizeOfKeysInWords; - unsigned short m_noOfBlobs; + Uint8 m_noOfKeys; + Uint8 m_noOfDistributionKeys; + Uint8 m_noOfBlobs; /** * Equality/assign |