postgres.git / summary / log / commit / refs

commit    f0b013b0fc0a53de0ffe610b403125affb9c6094
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Mon Aug 22 11:26:52 2022 +0000
First released in: 16.0, 15.0

    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


 src/bin/pg_upgrade/info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index df374ce4b36..53ea348e211 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


[parent: 64ef572c068f]