mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
Merge
ndb/include/kernel/AttributeHeader.hpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged ndb/test/include/HugoOperations.hpp: Auto merged ndb/test/ndbapi/testOIBasic.cpp: Auto merged ndb/test/src/HugoOperations.cpp: Auto merged ndb/test/src/HugoTransactions.cpp: Auto merged ndb/test/src/UtilTransactions.cpp: Auto merged ndb/tools/select_count.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: SCCS merged ndb/src/ndbapi/NdbDictionary.cpp: SCCS merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: SCCS merged
This commit is contained in:
@@ -388,6 +388,7 @@ public:
|
||||
static const Column * FRAGMENT;
|
||||
static const Column * ROW_COUNT;
|
||||
static const Column * COMMIT_COUNT;
|
||||
static const Column * ROW_SIZE;
|
||||
static const Column * RANGE_NO;
|
||||
#endif
|
||||
|
||||
@@ -754,8 +755,6 @@ public:
|
||||
Undefined = 0, ///< Undefined object type (initial value)
|
||||
UniqueHashIndex = 3, ///< Unique un-ordered hash index
|
||||
///< (only one currently supported)
|
||||
HashIndex = 4, ///< Non-unique un-ordered hash index
|
||||
UniqueOrderedIndex = 5, ///< Unique ordered index
|
||||
OrderedIndex = 6 ///< Non-unique ordered index
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user