aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2009-07-08 18:55:42 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2009-07-08 18:55:42 +0000
commit4f6bcc83144d7efa7df542e856bad611f51b449a (patch)
tree457cb36a3d31f6bba6f34dc5fbe30019718054d3 /src
parent35863c9557085d0a116ffb48dc371efe18b85fea (diff)
downloadpostgresql-4f6bcc83144d7efa7df542e856bad611f51b449a.tar.gz
postgresql-4f6bcc83144d7efa7df542e856bad611f51b449a.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.
Diffstat (limited to 'src')
-rw-r--r--src/backend/postmaster/postmaster.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 3dbf36a6cf1..41bb8e4ab0a 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.583.2.1 2009/07/08 18:55:42 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);
}