diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2008-09-23 09:20:39 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2008-09-23 09:20:39 +0000 |
| commit | 61d967498802ab86d8897cb3c61740d7e9d712f6 (patch) | |
| tree | 5571f2188fbc53d5d987bfc9c45036c83355de11 /src/backend/postmaster/postmaster.c | |
| parent | c52aab5525c13a3d378cd09f4187844ce697a948 (diff) | |
| download | postgresql-61d967498802ab86d8897cb3c61740d7e9d712f6.tar.gz | |
Make LC_COLLATE and LC_CTYPE database-level settings. Collation and
ctype are now more like encoding, stored in new datcollate and datctype
columns in pg_database.
This is a stripped-down version of Radek Strnad's patch, with further
changes by me.
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 72b9387767..51f766275b 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.563 2008/09/15 12:32:57 mha Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.564 2008/09/23 09:20:36 heikki Exp $ * * NOTES * @@ -403,8 +403,8 @@ typedef struct char my_exec_path[MAXPGPATH]; char pkglib_path[MAXPGPATH]; char ExtraOptions[MAXPGPATH]; - char lc_collate[LOCALE_NAME_BUFLEN]; - char lc_ctype[LOCALE_NAME_BUFLEN]; + char lc_collate[NAMEDATALEN]; + char lc_ctype[NAMEDATALEN]; } BackendParameters; static void read_backend_variables(char *id, Port *port); @@ -4294,8 +4294,8 @@ save_backend_variables(BackendParameters * param, Port *port, strlcpy(param->ExtraOptions, ExtraOptions, MAXPGPATH); - strlcpy(param->lc_collate, setlocale(LC_COLLATE, NULL), LOCALE_NAME_BUFLEN); - strlcpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), LOCALE_NAME_BUFLEN); + strlcpy(param->lc_collate, setlocale(LC_COLLATE, NULL), NAMEDATALEN); + strlcpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), NAMEDATALEN); return true; } |