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/bootstrap | |
| parent | 9438fe5d091162136e96991da391a559e078aa23 (diff) | |
| download | postgresql-c0b01461db59a472f5817a8c6e99091b8a48ffc5.tar.gz | |
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/bootstrap')
| -rw-r--r-- | src/backend/bootstrap/bootparse.y | 7 | ||||
| -rw-r--r-- | src/backend/bootstrap/bootscanner.l | 10 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index 393434ebc4..162ca00e78 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.20 1998/08/19 02:01:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.21 1998/08/24 01:13:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,13 +31,8 @@ #include "bootstrap/bootstrap.h" #include "catalog/heap.h" #include "catalog/pg_am.h" -#ifdef MULTIBYTE -#include "catalog/pg_attribute_mb.h" -#include "catalog/pg_class_mb.h" -#else #include "catalog/pg_attribute.h" #include "catalog/pg_class.h" -#endif #include "commands/defrem.h" #include "nodes/nodes.h" #include "nodes/parsenodes.h" diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l index a97fb7fc57..189b717bb6 100644 --- a/src/backend/bootstrap/bootscanner.l +++ b/src/backend/bootstrap/bootscanner.l @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.10 1998/07/26 04:30:19 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.11 1998/08/24 01:13:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,11 +20,7 @@ #include "storage/block.h" #include "storage/off.h" #include "storage/itemptr.h" -#ifdef MULTIBYTE -#include "catalog/pg_attribute_mb.h" -#else #include "catalog/pg_attribute.h" -#endif #include "access/attnum.h" #include "nodes/pg_list.h" #include "access/tupdesc.h" @@ -32,11 +28,7 @@ #include "access/funcindex.h" #include "storage/fd.h" #include "catalog/pg_am.h" -#ifdef MULTIBYTE -#include "catalog/pg_class_mb.h" -#else #include "catalog/pg_class.h" -#endif #include "nodes/nodes.h" #include "rewrite/prs2lock.h" #include "access/skey.h" |