Fix rebase conflict

preventConflictingFlags
Onder Kalaci 2020-04-07 15:14:16 +02:00
parent ab345ab4fb
commit ffd7dcc88f
1 changed files with 2 additions and 0 deletions

View File

@ -1953,6 +1953,8 @@ FindOrCreateWorkerPool(DistributedExecution *execution, char *nodeName, int node
dlist_init(&workerPool->pendingTaskQueue); dlist_init(&workerPool->pendingTaskQueue);
dlist_init(&workerPool->readyTaskQueue); dlist_init(&workerPool->readyTaskQueue);
workerPool->distributedExecution = execution;
execution->workerList = lappend(execution->workerList, workerPool); execution->workerList = lappend(execution->workerList, workerPool);
return workerPool; return workerPool;