diff options
Diffstat (limited to 'src/backend/utils/mb/mbutils.c')
| -rw-r--r-- | src/backend/utils/mb/mbutils.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 5aaaae502f8..c8a43dced6f 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -4,7 +4,7 @@ * * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.91 2009/10/17 05:14:52 mha Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.92 2009/11/12 02:46:16 tgl Exp $ */ #include "postgres.h" @@ -984,7 +984,14 @@ int GetPlatformEncoding(void) { if (PlatformEncoding == NULL) - PlatformEncoding = &pg_enc2name_tbl[pg_get_encoding_from_locale("")]; + { + /* try to determine encoding of server's environment locale */ + int encoding = pg_get_encoding_from_locale(""); + + if (encoding < 0) + encoding = PG_SQL_ASCII; + PlatformEncoding = &pg_enc2name_tbl[encoding]; + } return PlatformEncoding->encoding; } |