Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b11ce56

Browse files
committed
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.
1 parent e5bb0f0 commit b11ce56

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

src/backend/postmaster/postmaster.c

+1-9
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.583 2009/06/26 20:29:04 tgl Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.584 2009/07/08 18:55:35 tgl Exp $
4141
*
4242
* NOTES
4343
*
@@ -424,8 +424,6 @@ typedef struct
424424
char my_exec_path[MAXPGPATH];
425425
char pkglib_path[MAXPGPATH];
426426
char ExtraOptions[MAXPGPATH];
427-
char lc_collate[NAMEDATALEN];
428-
char lc_ctype[NAMEDATALEN];
429427
} BackendParameters;
430428

431429
static void read_backend_variables(char *id, Port *port);
@@ -4475,9 +4473,6 @@ save_backend_variables(BackendParameters *param, Port *port,
44754473

44764474
strlcpy(param->ExtraOptions, ExtraOptions, MAXPGPATH);
44774475

4478-
strlcpy(param->lc_collate, setlocale(LC_COLLATE, NULL), NAMEDATALEN);
4479-
strlcpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), NAMEDATALEN);
4480-
44814476
return true;
44824477
}
44834478

@@ -4680,9 +4675,6 @@ restore_backend_variables(BackendParameters *param, Port *port)
46804675
strlcpy(pkglib_path, param->pkglib_path, MAXPGPATH);
46814676

46824677
strlcpy(ExtraOptions, param->ExtraOptions, MAXPGPATH);
4683-
4684-
setlocale(LC_COLLATE, param->lc_collate);
4685-
setlocale(LC_CTYPE, param->lc_ctype);
46864678
}
46874679

46884680

0 commit comments

Comments
 (0)