Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2

This commit is contained in:
Jan Steemann 2014-08-22 09:52:00 +02:00
parent 2b27957546 c4918e4fb7
commit d1f550b65e
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/ExecutionPlan.cpp
View File

@ -1016,8 +1016,6 @@ void ExecutionPlan::unlinkNodes (std::unordered_set<ExecutionNode*>& toRemove) {
////////////////////////////////////////////////////////////////////////////////
void ExecutionPlan::unlinkNode (ExecutionNode* node) {
checkLinkage();
std::cout << toJson(TRI_UNKNOWN_MEM_ZONE, true).toString() << std::endl;
auto parents = node->getParents();
if (parents.empty()) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
@ -1035,8 +1033,6 @@ void ExecutionPlan::unlinkNode (ExecutionNode* node) {
node->removeDependency(x);
}
}
std::cout << toJson(TRI_UNKNOWN_MEM_ZONE, true).toString() << std::endl;
checkLinkage();
}
////////////////////////////////////////////////////////////////////////////////

2
arangod/VocBase/transaction.cpp
View File

@ -865,7 +865,7 @@ int TRI_AddCollectionTransaction (TRI_transaction_t* trx,
}
// check if we already have got this collection in the _collections vector
size_t position;
size_t position = 0;
TRI_transaction_collection_t* trxCollection = FindCollection(trx, cid, &position);
if (trxCollection != nullptr) {

2
lib/ProgramOptions/program-options.cpp
View File

@ -1410,7 +1410,7 @@ bool TRI_ParseArgumentsProgramOptions (TRI_program_options_t * options,
extern int optind;
TRI_string_buffer_t buffer;
TRI_PO_item_t * item;
TRI_PO_item_t* item = nullptr;
const char* shortOptions;
size_t i;
int idx;