diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-07-08 18:55:35 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-07-08 18:55:35 +0000 |
| commit | b11ce5608ab7b053478a6180d98818c02df40f46 (patch) | |
| tree | a824ebfd16d0b0866d16bcad238c29481646c686 | |
| parent | e5bb0f04db225a06e08b9b74cde82325c87a8de3 (diff) | |
| download | postgresql-b11ce5608ab7b053478a6180d98818c02df40f46.tar.gz postgresql-b11ce5608ab7b053478a6180d98818c02df40f46.zip | |
Remove no-longer-necessary transmission of postmaster's LC_COLLATE and
LC_CTYPE settings to children via BackendParameters. Per discussion,
the postmaster is now just using system defaults anyway, so we might as
well save a few cycles during backend startup.
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 3dbf36a6cf1..ed26a3f25ec 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.583 2009/06/26 20:29:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.584 2009/07/08 18:55:35 tgl Exp $ * * NOTES * @@ -424,8 +424,6 @@ typedef struct char my_exec_path[MAXPGPATH]; char pkglib_path[MAXPGPATH]; char ExtraOptions[MAXPGPATH]; - char lc_collate[NAMEDATALEN]; - char lc_ctype[NAMEDATALEN]; } BackendParameters; static void read_backend_variables(char *id, Port *port); @@ -4475,9 +4473,6 @@ save_backend_variables(BackendParameters *param, Port *port, strlcpy(param->ExtraOptions, ExtraOptions, MAXPGPATH); - strlcpy(param->lc_collate, setlocale(LC_COLLATE, NULL), NAMEDATALEN); - strlcpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), NAMEDATALEN); - return true; } @@ -4680,9 +4675,6 @@ restore_backend_variables(BackendParameters *param, Port *port) strlcpy(pkglib_path, param->pkglib_path, MAXPGPATH); strlcpy(ExtraOptions, param->ExtraOptions, MAXPGPATH); - - setlocale(LC_COLLATE, param->lc_collate); - setlocale(LC_CTYPE, param->lc_ctype); } |