Make initdb ignore locales for client-only encodings.

tglsfdc · tglsfdc · commit 5d1d679dbf78 · 2011-03-22T17:20:50.000-04:00
While putting such entries into pg_collation is harmless (since backends
will ignore entries that don't match the database encoding), it's also
useless.
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -1638,6 +1638,8 @@ setup_collation(void)
 			skipped++;
 			continue;			/* error message printed by pg_get_encoding_from_locale() */
 		}
+		if (!PG_VALID_BE_ENCODING(enc))
+			continue;			/* ignore locales for client-only encodings */
 		if (enc == PG_SQL_ASCII)
 			continue;			/* C/POSIX are already in the catalog */
 

Original file line number	Diff line number	Diff line change
`@@ -1638,6 +1638,8 @@ setup_collation(void)`
`1638`	`1638`	`skipped++;`
`1639`	`1639`	`continue; /* error message printed by pg_get_encoding_from_locale() */`
`1640`	`1640`	`}`
	`1641`	`+ if (!PG_VALID_BE_ENCODING(enc))`
	`1642`	`+ continue; /* ignore locales for client-only encodings */`
`1641`	`1643`	`if (enc == PG_SQL_ASCII)`
`1642`	`1644`	`continue; /* C/POSIX are already in the catalog */`
`1643`	`1645`