Patch for 930 release

This commit is contained in:
dengxuyue
2021-09-23 15:19:37 +08:00
parent bab3e083eb
commit 1d540f4462
3791 changed files with 481850 additions and 115139 deletions

View File

@ -16,8 +16,8 @@
#include "postgres.h"
#include "knl/knl_variable.h"
#include "executor/execdebug.h"
#include "executor/nodeSort.h"
#include "executor/exec/execdebug.h"
#include "executor/node/nodeSort.h"
#include "miscadmin.h"
#include "optimizer/streamplan.h"
#include "pgstat.h"
@ -25,6 +25,9 @@
#include "utils/tuplesort.h"
#include "workload/workload.h"
#include "optimizer/var.h"
#include "optimizer/tlist.h"
#ifdef PGXC
#include "pgxc/pgxc.h"
#endif
@ -243,7 +246,6 @@ SortState* ExecInitSort(Sort* node, EState* estate, int eflags)
* MARK/RESTORE.
*/
eflags &= ~(EXEC_FLAG_REWIND | EXEC_FLAG_BACKWARD | EXEC_FLAG_MARK);
outerPlanState(sortstate) = ExecInitNode(outerPlan(node), estate, eflags);
/*