diff options
Diffstat (limited to 'src/backend/utils/init/postinit.c')
| -rw-r--r-- | src/backend/utils/init/postinit.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 36de3172664..57ce319e764 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.30 1998/06/27 04:53:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.31 1998/07/24 03:31:50 scrappy Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -66,7 +66,12 @@ #include "utils/inval.h" #include "catalog/catname.h" +#ifdef MB +#include "catalog/pg_database_mb.h" +#include "mb/pg_wchar.h" +#else #include "catalog/pg_database.h" +#endif #include "libpq/libpq.h" @@ -78,7 +83,11 @@ static void InitStdio(void); static void InitUserid(void); extern char *ExpandDatabasePath(char *name); +#ifdef MB +extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path, int *encoding); +#else extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path); +#endif static IPCKey PostgresIpcKey; @@ -119,9 +128,16 @@ InitMyDatabaseInfo(char *name) Oid owner; char *path, myPath[MAXPGPATH + 1]; +#ifdef MB + int encoding; +#endif SetDatabaseName(name); +#ifdef MB + GetRawDatabaseInfo(name, &owner, &MyDatabaseId, myPath, &encoding); +#else GetRawDatabaseInfo(name, &owner, &MyDatabaseId, myPath); +#endif if (!OidIsValid(MyDatabaseId)) elog(FATAL, @@ -131,6 +147,9 @@ InitMyDatabaseInfo(char *name) path = ExpandDatabasePath(myPath); SetDatabasePath(path); +#ifdef MB + SetDatabaseEncoding(encoding); +#endif return; } /* InitMyDatabaseInfo() */ |