Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit cd638ff

Browse files
peterepull[bot]
authored andcommitted
pg_upgrade: Fix thinko in database info acquisition routine
When checking whether the major version supports per-database locale providers, it was always looking at the version of the old cluster instead of the cluster that was passed in. This would lead to failures 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 parent 0114ca8 commit cd638ff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bin/pg_upgrade/info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ get_db_infos(ClusterInfo *cluster)
319319

320320
snprintf(query, sizeof(query),
321321
"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)
323323
snprintf(query + strlen(query), sizeof(query) - strlen(query),
324324
"'c' AS datlocprovider, NULL AS daticulocale, ");
325325
else

0 commit comments

Comments
 (0)