Commit3725b7f

committed

pg_upgrade: Fix thinko in database info acquisition routine

When checking whether the major version supports per-database localeproviders, it was always looking at the version of the old clusterinstead of the cluster that was passed in. This would lead tofailures to detect locale provider mismatches.Reported-by: Marina Polyakova <m.polyakova@postgrespro.ru>Reviewed-by: Julien Rouhaud <rjuju123@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/f385ba25e7f8be427b8c582e5cca7d79%40postgrespro.ru#515a31c5429d6d37ad1d5c9d66962a1e

1 parent254d79f commit3725b7fCopy full SHA for 3725b7f

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ get_db_infos(ClusterInfo *cluster)`
`319`	`319`
`320`	`320`	`snprintf(query,sizeof(query),`
`321`	`321`	`"SELECT d.oid, d.datname, d.encoding, d.datcollate, d.datctype, ");`
`322`		`-if (GET_MAJOR_VERSION(old_cluster.major_version)<1500)`
	`322`	`+if (GET_MAJOR_VERSION(cluster->major_version)<1500)`
`323`	`323`	`snprintf(query+strlen(query),sizeof(query)-strlen(query),`
`324`	`324`	`"'c' AS datlocprovider, NULL AS daticulocale, ");`
`325`	`325`	`else`

Comments

(0)