mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +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:
@ -29,10 +29,13 @@ main(int argc, const char** argv){
|
||||
|
||||
const char* _dbname = "TEST_DB";
|
||||
int _help = 0;
|
||||
int _ordered, _pk;
|
||||
|
||||
struct getargs args[] = {
|
||||
{ "database", 'd', arg_string, &_dbname, "dbname",
|
||||
"Name of database table is in"},
|
||||
{ "ordered", 'o', arg_flag, &_ordered, "Create ordered index", "" },
|
||||
{ "pk", 'p', arg_flag, &_pk, "Create index on primary key", "" },
|
||||
{ "usage", '?', arg_flag, &_help, "Print help", "" }
|
||||
};
|
||||
|
||||
@ -73,14 +76,21 @@ main(int argc, const char** argv){
|
||||
}
|
||||
|
||||
NdbDictionary::Index ind;
|
||||
if(_ordered){
|
||||
ind.setType(NdbDictionary::Index::OrderedIndex);
|
||||
ind.setLogging(false);
|
||||
} else {
|
||||
ind.setType(NdbDictionary::Index::UniqueHashIndex);
|
||||
}
|
||||
char buf[512];
|
||||
sprintf(buf, "IND_%s", argv[i]);
|
||||
sprintf(buf, "IND_%s_%s_%c",
|
||||
argv[i], (_pk ? "PK" : "FULL"), (_ordered ? 'O' : 'U'));
|
||||
ind.setName(buf);
|
||||
ind.setTable(argv[i]);
|
||||
ind.setType(NdbDictionary::Index::UniqueHashIndex);
|
||||
for(int c = 0; c<tab->getNoOfColumns(); c++)
|
||||
ind.addIndexColumn(tab->getColumn(c)->getName());
|
||||
|
||||
for(int c = 0; c<tab->getNoOfColumns(); c++){
|
||||
if(!_pk || tab->getColumn(c)->getPrimaryKey())
|
||||
ind.addIndexColumn(tab->getColumn(c)->getName());
|
||||
}
|
||||
ndbout << "creating index " << buf << " on table " << argv[i] << "...";
|
||||
const int res = dict->createIndex(ind);
|
||||
if(res != 0)
|
||||
|
Reference in New Issue
Block a user