diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-03-22 17:20:50 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-03-22 17:20:50 -0400 |
| commit | 5d1d679dbf780694673529bd864ca1e258ae50d5 (patch) | |
| tree | 50e04c2686610d0467a24e96be11d6983c931ab0 | |
| parent | 6e197cb2e537880f36828a6c55d0f6df5bf7daa8 (diff) | |
| download | postgresql-5d1d679dbf780694673529bd864ca1e258ae50d5.tar.gz postgresql-5d1d679dbf780694673529bd864ca1e258ae50d5.zip | |
Make initdb ignore locales for client-only encodings.
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.
| -rw-r--r-- | src/bin/initdb/initdb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 98e864d5495..4db34e5f2ea 100644 --- 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 */ |