1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Quotes in strings injected into bki file need to escaped. In particular,

Browse Source 
"People's Republic of China" locale on Windows was causing initdb to fail.

This fixes bug #5818 reported by yulei. On master, this makes the mapping
of "People's Republic of China" to just "China" obsolete. In 9.0 and 8.4,
just fix the escaping. Earlier versions didn't have locale names in bki
file.
This commit is contained in:
Heikki Linnakangas 2011-04-20 09:49:44 +03:00
parent 5a4305fdf7
commit a58396d79e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/initdb/initdb.c
View File

@ -1355,9 +1355,9 @@ bootstrap_template1(char *short_version)
bki_lines = replace_token(bki_lines, "ENCODING", encodingid);
bki_lines = replace_token(bki_lines, "LC_COLLATE", lc_collate);
bki_lines = replace_token(bki_lines, "LC_COLLATE", escape_quotes(lc_collate));
bki_lines = replace_token(bki_lines, "LC_CTYPE", lc_ctype);
bki_lines = replace_token(bki_lines, "LC_CTYPE", escape_quotes(lc_ctype));
/*
* Pass correct LC_xxx environment to bootstrap.