Commit 3d185cf
committed
Restore initdb's old behavior of always setting the lc_xxx GUCs.
In commit 3e51b27 I (tgl) caused initdb to leave lc_messages and
other lc_xxx GUCs commented-out in the installed postgresql.conf file
if they were going to be set to 'C'. This was a hack for cosmetic
purposes, and it was buggy because lc_messages' wired-in default is
not 'C' but '' (empty string). That led to --no-locale not having
the expected effect, since the postmaster would then obtain
lc_messages from its startup environment.
Let's just revert to the prior behavior of always de-commenting the
lc_xxx entries; the argument for changing that longstanding behavior
was weak in the first place.
Also, fix postgresql.conf.sample's erroneous claim that the default
value of lc_messages is 'C'. I suspect that was what misled me into
making this mistake in the first place.
Report and patch by Kyotaro Horiguchi. Back-patch to v16 where
the problem was introduced.
Discussion: https://postgr.es/m/20231122.162700.1995154567625541112.horikyota.ntt@gmail.com1 parent 390298f commit 3d185cf
File tree
2 files changed
+9
-17
lines changed- src
- backend/utils/misc
- bin/initdb
2 files changed
+9
-17
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
734 | 734 | | |
735 | 735 | | |
736 | 736 | | |
737 | | - | |
| 737 | + | |
738 | 738 | | |
739 | 739 | | |
740 | 740 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1227 | 1227 | | |
1228 | 1228 | | |
1229 | 1229 | | |
1230 | | - | |
1231 | | - | |
1232 | | - | |
1233 | | - | |
1234 | | - | |
1235 | | - | |
1236 | | - | |
| 1230 | + | |
| 1231 | + | |
1237 | 1232 | | |
1238 | | - | |
1239 | | - | |
1240 | | - | |
| 1233 | + | |
| 1234 | + | |
1241 | 1235 | | |
1242 | | - | |
1243 | | - | |
1244 | | - | |
| 1236 | + | |
| 1237 | + | |
1245 | 1238 | | |
1246 | | - | |
1247 | | - | |
1248 | | - | |
| 1239 | + | |
| 1240 | + | |
1249 | 1241 | | |
1250 | 1242 | | |
1251 | 1243 | | |
| |||
0 commit comments