Commit 505fa08

committed

Merge branch 'next' of github.com:postgrespro/pg_pathman into next

2 parents 59ce652 + 01dd49b commit 505fa08Copy full SHA for 505fa08

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -630,9 +630,9 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,`
`630`	`630`	`/* Handle foreign tables */`
`631`	`631`	`else`
`632`	`632`	`{`
`633`		`- child_result_rel->ri_FdwRoutine->ForeignNextCopyFrom(estate,`
`634`		`- child_rri,`
`635`		`- cstate);`
	`633`	`+ child_rri->ri_FdwRoutine->ForeignNextCopyFrom(estate,`
	`634`	`+ child_rri,`
	`635`	`+ cstate);`
`636`	`636`	`}`
`637`	`637`	`#endif`
`638`	`638`
`@@ -706,7 +706,7 @@ prepare_rri_for_copy(ResultRelInfoHolder *rri_holder,`
`706`	`706`	`FdwCopyFromIsSupported(fdw_routine))`
`707`	`707`	`{`
`708`	`708`	`CopyState cstate = (CopyState) rps_storage->init_rri_holder_cb_arg;`
`709`		`- ResultRelInfo *parent_rri = rps_storage->saved_rel_info;`
	`709`	`+ ResultRelInfo *parent_rri = rps_storage->base_rri;`
`710`	`710`	`EState *estate = rps_storage->estate;`
`711`	`711`
`712`	`712`	`fdw_routine->BeginForeignCopyFrom(estate, rri, cstate, parent_rri);`

Comments

(0)