Remove no-longer-necessary transmission of postmaster's LC_COLLATE and

tglsfdc · tglsfdc · commit b11ce5608ab7 · 2009-07-08T18:55:35.000Z
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.
diff --git 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);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* 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 $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -424,8 +424,6 @@ typedef struct`
`424`	`424`	`char my_exec_path[MAXPGPATH];`
`425`	`425`	`char pkglib_path[MAXPGPATH];`
`426`	`426`	`char ExtraOptions[MAXPGPATH];`
`427`		`- char lc_collate[NAMEDATALEN];`
`428`		`- char lc_ctype[NAMEDATALEN];`
`429`	`427`	`} BackendParameters;`
`430`	`428`
`431`	`429`	`static void read_backend_variables(char id, Port port);`
`@@ -4475,9 +4473,6 @@ save_backend_variables(BackendParameters param, Port port,`
`4475`	`4473`
`4476`	`4474`	`strlcpy(param->ExtraOptions, ExtraOptions, MAXPGPATH);`
`4477`	`4475`
`4478`		`- strlcpy(param->lc_collate, setlocale(LC_COLLATE, NULL), NAMEDATALEN);`
`4479`		`- strlcpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), NAMEDATALEN);`
`4480`		`-`
`4481`	`4476`	`return true;`
`4482`	`4477`	`}`
`4483`	`4478`
`@@ -4680,9 +4675,6 @@ restore_backend_variables(BackendParameters param, Port port)`
`4680`	`4675`	`strlcpy(pkglib_path, param->pkglib_path, MAXPGPATH);`
`4681`	`4676`
`4682`	`4677`	`strlcpy(ExtraOptions, param->ExtraOptions, MAXPGPATH);`
`4683`		`-`
`4684`		`- setlocale(LC_COLLATE, param->lc_collate);`
`4685`		`- setlocale(LC_CTYPE, param->lc_ctype);`
`4686`	`4678`	`}`
`4687`	`4679`
`4688`	`4680`