mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
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
This commit is contained in:
@@ -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"
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user