aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2022-08-22 13:26:52 +0200
committerPeter Eisentraut <peter@eisentraut.org>2022-08-22 14:30:41 +0200
commit3725b7f3c93eac3148fe36cffbb7db47d4a9fae0 (patch)
tree75eeb7a03f34855b6c7793ecdbe27a2fbe52e14c /src
parent254d79f0b23dfe107594c90ee8375165422db2c4 (diff)
downloadpostgresql-3725b7f3c93eac3148fe36cffbb7db47d4a9fae0.tar.gz
postgresql-3725b7f3c93eac3148fe36cffbb7db47d4a9fae0.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_upgrade/info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 36b0670df66..89df7afbdc4 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -319,7 +319,7 @@ get_db_infos(ClusterInfo *cluster)
snprintf(query, sizeof(query),
"SELECT d.oid, d.datname, d.encoding, d.datcollate, d.datctype, ");
- if (GET_MAJOR_VERSION(old_cluster.major_version) < 1500)
+ if (GET_MAJOR_VERSION(cluster->major_version) < 1500)
snprintf(query + strlen(query), sizeof(query) - strlen(query),
"'c' AS datlocprovider, NULL AS daticulocale, ");
else