Commit7971a57

committed

Fix pg_upgrade to preserve toast relfrozenxids for old 8.3 servers.

This fixes a pg_upgrade bug that could lead to query errors whenclog files are improperly removed.Backpatch to 8.4, 9.0, 9.1.

1 parent97930cf commit7971a57Copy full SHA for 7971a57

File tree

-9

lines changed

-9

lines changed

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -3978,14 +3978,13 @@ getTables(int *numTables)`
`3978`	`3978`	`* owning column, if any (note this dependency is AUTO as of 8.2)`
`3979`	`3979`	`*/`
`3980`	`3980`	`appendPQExpBuffer(query,`
`3981`		`-"SELECT c.tableoid, c.oid, relname, "`
`3982`		`-"relacl, relkind, relnamespace, "`
`3983`		`-"(%s relowner) AS rolname, "`
`3984`		`-"relchecks, (reltriggers <> 0) AS relhastriggers, "`
`3985`		`-"relhasindex, relhasrules, relhasoids, "`
`3986`		`-"relfrozenxid, "`
`3987`		`-"0 AS toid, "`
`3988`		`-"0 AS tfrozenxid, "`
	`3981`	`+"SELECT c.tableoid, c.oid, c.relname, "`
	`3982`	`+"c.relacl, c.relkind, c.relnamespace, "`
	`3983`	`+"(%s c.relowner) AS rolname, "`
	`3984`	`+"c.relchecks, (c.reltriggers <> 0) AS relhastriggers, "`
	`3985`	`+"c.relhasindex, c.relhasrules, c.relhasoids, "`
	`3986`	`+"c.relfrozenxid, tc.oid AS toid, "`
	`3987`	`+"tc.relfrozenxid AS tfrozenxid, "`
`3989`	`3988`	`"'p' AS relpersistence, "`
`3990`	`3989`	`"NULL AS reloftype, "`
`3991`	`3990`	`"d.refobjid AS owning_tab, "`
`@@ -3999,7 +3998,8 @@ getTables(int *numTables)`
`3999`	`3998`	`"d.classid = c.tableoid AND d.objid = c.oid AND "`
`4000`	`3999`	`"d.objsubid = 0 AND "`
`4001`	`4000`	`"d.refclassid = c.tableoid AND d.deptype = 'a') "`
`4002`		`-"WHERE relkind in ('%c', '%c', '%c', '%c') "`
	`4001`	`+"LEFT JOIN pg_class tc ON (c.reltoastrelid = tc.oid) "`
	`4002`	`+"WHERE c.relkind in ('%c', '%c', '%c', '%c') "`
`4003`	`4003`	`"ORDER BY c.oid",`
`4004`	`4004`	`username_subquery,`
`4005`	`4005`	`RELKIND_SEQUENCE,`

Comments

(0)