diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-08-24 01:14:24 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-08-24 01:14:24 +0000 |
| commit | c0b01461db59a472f5817a8c6e99091b8a48ffc5 (patch) | |
| tree | 8ea77fde00c4a8da22920d9d0aa7f8b8a77e67e0 /src/backend/storage | |
| parent | 9438fe5d091162136e96991da391a559e078aa23 (diff) | |
| download | postgresql-c0b01461db59a472f5817a8c6e99091b8a48ffc5.tar.gz postgresql-c0b01461db59a472f5817a8c6e99091b8a48ffc5.zip | |
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
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/lmgr/lmgr.c | 6 | ||||
| -rw-r--r-- | src/backend/storage/smgr/md.c | 15 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index bcdc57d54fc..a24d7298087 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.17 1998/08/19 02:02:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.18 1998/08/24 01:13:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,11 +41,7 @@ #include "catalog/catname.h" #include "catalog/catalog.h" -#ifdef MULTIBYTE -#include "catalog/pg_class_mb.h" -#else #include "catalog/pg_class.h" -#endif #include "nodes/memnodes.h" #include "storage/bufmgr.h" diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 74df4039063..c753b583d85 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.36 1998/08/11 18:28:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.37 1998/08/24 01:13:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -568,15 +568,9 @@ mdblindwrt(char *dbstr, int4 owner; Oid id; char *tmpPath; -#ifdef MULTIBYTE int tmpEncoding; -#endif -#ifdef MULTIBYTE GetRawDatabaseInfo(dbstr, &owner, &id, dbpath, &tmpEncoding); -#else - GetRawDatabaseInfo(dbstr, &owner, &id, dbpath); -#endif if (id != dbid) elog(FATAL, "mdblindwrt: oid of db %s is not %u", dbstr, dbid); @@ -613,16 +607,9 @@ mdblindwrt(char *dbstr, int4 owner; Oid id; char *tmpPath; - -#ifdef MULTIBYTE int tmpEncoding; -#endif -#ifdef MULTIBYTE GetRawDatabaseInfo(dbstr, &owner, &id, dbpath, &tmpEncoding); -#else - GetRawDatabaseInfo(dbstr, &owner, &id, dbpath); -#endif if (id != dbid) elog(FATAL, "mdblindwrt: oid of db %s is not %u", dbstr, dbid); |