aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/init/postinit.c
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>2002-08-29 07:22:30 +0000
committerTatsuo Ishii <ishii@postgresql.org>2002-08-29 07:22:30 +0000
commited7baeaf4df676489106ab761936cdae9ffb7228 (patch)
tree91908d828af2d2c6e4bd96374d932cec73aaf01d /src/backend/utils/init/postinit.c
parent8e80dbb849cc63f6652a5fc645fa4d1e136c3c4c (diff)
downloadpostgresql-ed7baeaf4df676489106ab761936cdae9ffb7228.tar.gz
postgresql-ed7baeaf4df676489106ab761936cdae9ffb7228.zip
Remove #ifdef MULTIBYTE per hackers list discussion.
Diffstat (limited to 'src/backend/utils/init/postinit.c')
-rw-r--r--src/backend/utils/init/postinit.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 433b9a5ed05..f36c1d981fa 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.109 2002/07/20 05:16:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.110 2002/08/29 07:22:28 ishii Exp $
*
*
*-------------------------------------------------------------------------
@@ -130,17 +130,10 @@ ReverifyMyDatabase(const char *name)
* encoding info out of the pg_database tuple --- or complain, if we
* can't support it.
*/
-#ifdef MULTIBYTE
SetDatabaseEncoding(dbform->encoding);
/* If we have no other source of client_encoding, use server encoding */
SetConfigOption("client_encoding", GetDatabaseEncodingName(),
PGC_BACKEND, PGC_S_DEFAULT);
-#else
- if (dbform->encoding != PG_SQL_ASCII)
- elog(FATAL, "database was initialized with MULTIBYTE encoding %d,\n\tbut the backend was compiled without multibyte support.\n\tlooks like you need to initdb or recompile.",
- dbform->encoding);
-#endif
-
/*
* Set up database-specific configuration variables.
*/