From c0b01461db59a472f5817a8c6e99091b8a48ffc5 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 24 Aug 1998 01:14:24 +0000
Subject: o note that now pg_database has a new attribuite "encoding" even if
 MULTIBYTE is not enabled. So be sure to run initdb.

o these patches are made against the latest source tree (after
Bruce's massive patch, I think) BTW, I noticed that after running
regression, the oid field of pg_type seems disappeared.

	regression=> select oid from pg_type; ERROR:  attribute
	'oid' not found

this happens after the constraints test. This occures with/without
my patches. strange...

o pg_database_mb.h, pg_class_mb.h, pg_attribute_mb.h are no longer
used, and shoud be removed.

o GetDatabaseInfo() in utils/misc/database.c removed (actually in
#ifdef 0). seems nobody uses.

t-ishii@sra.co.jp
---
 src/backend/utils/init/postinit.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'src/backend/utils/init/postinit.c')

diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 12d1255b9ba..790684cda13 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.33 1998/08/11 18:28:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.34 1998/08/24 01:13:56 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -67,10 +67,7 @@
 
 #include "catalog/catname.h"
 #ifdef MULTIBYTE
-#include "catalog/pg_database_mb.h"
 #include "mb/pg_wchar.h"
-#else
-#include "catalog/pg_database.h"
 #endif
 
 #include "libpq/libpq.h"
@@ -83,11 +80,7 @@ static void InitStdio(void);
 static void InitUserid(void);
 
 extern char *ExpandDatabasePath(char *name);
-#ifdef MULTIBYTE
 extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path, int *encoding);
-#else
-extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path);
-#endif
 
 static IPCKey PostgresIpcKey;
 
@@ -128,16 +121,10 @@ InitMyDatabaseInfo(char *name)
 	int4		owner;
 	char	   *path,
 				myPath[MAXPGPATH + 1];
-#ifdef MULTIBYTE
 	int encoding;
-#endif
 
 	SetDatabaseName(name);
-#ifdef MULTIBYTE
 	GetRawDatabaseInfo(name, &owner, &MyDatabaseId, myPath, &encoding);
-#else
-	GetRawDatabaseInfo(name, &owner, &MyDatabaseId, myPath);
-#endif
 
 	if (!OidIsValid(MyDatabaseId))
 		elog(FATAL,
-- 
cgit v1.2.3