git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c

index 1c68fe906f4b2f61f55e2e4637ecd6b1b0de7cbd..63f0bdc12c99031249912a49c55671accac8a169 100644 (file)

--- a/src/backend/catalog/heap.c

+++ b/src/backend/catalog/heap.c

*

*

* IDENTIFICATION

- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.126 2000年05月19日 03:22:31 tgl Exp $

+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.127 2000年05月20日 23:11:29 tgl Exp $

*

*

* INTERFACE ROUTINES

#include "storage/smgr.h"

#include "tcop/tcopprot.h"

#include "utils/builtins.h"

+#include "utils/catcache.h"

#include "utils/portal.h"

#include "utils/relcache.h"

#include "utils/syscache.h"

bool istemp,

bool storage_create)

{

+ static unsigned int uniqueId = 0;

+

int i;

Oid relid;

Relation rel;

int len;

bool nailme = false;

int natts = tupDesc->natts;

- static unsigned int uniqueId = 0;

-

- extern GlobalMemory CacheCxt;

MemoryContext oldcxt;

-

/* ----------------

* sanity checks

* ----------------

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c

index fc2cf0fca35bfedc5b3438130285f9ff62b68d8e..cfc5805b7c52c7b249048ad2e28b6d1ad9981c15 100644 (file)

--- a/src/backend/catalog/index.c

+++ b/src/backend/catalog/index.c

*

*

* IDENTIFICATION

- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.109 2000年05月19日 03:22:31 tgl Exp $

+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.110 2000年05月20日 23:11:28 tgl Exp $

*

*

* INTERFACE ROUTINES

#include "parser/parse_func.h"

#include "storage/smgr.h"

#include "utils/builtins.h"

+#include "utils/catcache.h"

#include "utils/relcache.h"

#include "utils/syscache.h"

#include "utils/temprel.h"

static void

ConstructIndexReldesc(Relation indexRelation, Oid amoid)

{

- extern GlobalMemory CacheCxt;

MemoryContext oldcxt;

/* ----------------

uint16 amsupport;

Oid attrelid;

Size strsize;

- extern GlobalMemory CacheCxt;

/* ----------------

* get information from the index relation descriptor

diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c

index d5e7ba2dce9cdd2f95e229ed245fe731418c1577..c8d5b1f29b78796acc9a61bf106ca4f84d6b898a 100644 (file)

--- a/src/backend/utils/cache/temprel.c

+++ b/src/backend/utils/cache/temprel.c

*

*

* IDENTIFICATION

- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.21 2000年04月12日 17:15:54 momjian Exp $

+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.22 2000年05月20日 23:11:29 tgl Exp $

*

*-------------------------------------------------------------------------

*/

#include "access/xact.h"

#include "catalog/heap.h"

#include "catalog/index.h"

+#include "utils/catcache.h"

#include "utils/temprel.h"

-GlobalMemory CacheCxt;

/* ----------------

* global variables