mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge 4.1 with jonas irix clone
BitKeeper/etc/logging_ok: auto-union ndb/include/kernel/NodeState.hpp: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/include/util/Bitmask.hpp: Auto merged ndb/src/common/debugger/EventLogger.cpp: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/common/util/SocketServer.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/kernel/error/ErrorReporter.hpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmclient/CpcClient.cpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged ndb/src/ndbapi/Ndb.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged ndb/src/ndbapi/Ndbinit.cpp: Auto merged ndb/test/include/NDBT_Table.hpp: Auto merged ndb/test/include/NDBT_Test.hpp: Auto merged ndb/test/run-test/main.cpp: Auto merged ndb/test/src/HugoOperations.cpp: Auto merged ndb/test/src/HugoTransactions.cpp: Auto merged ndb/test/src/NDBT_Tables.cpp: Auto merged ndb/test/src/NDBT_Test.cpp: Auto merged ndb/test/src/NdbRestarter.cpp: Auto merged ndb/tools/waiter.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
This commit is contained in:
@ -25,7 +25,7 @@
|
||||
class NDBT_Attribute : public NdbDictionary::Column {
|
||||
public:
|
||||
NDBT_Attribute(const char* _name,
|
||||
Column::Type _type,
|
||||
NdbDictionary::Column::Type _type,
|
||||
int _length = 1,
|
||||
bool _pk = false,
|
||||
bool _nullable = false):
|
||||
|
Reference in New Issue
Block a user