Re-add pg_index.indisclustered in a minimalist way. Also fix BSDi

dynamic linker change.  #include must be before #ifdef test.
This commit is contained in:
Bruce Momjian 2001-05-15 01:12:59 +00:00
parent 7809cbf7e6
commit f756acf8a8
4 changed files with 17 additions and 11 deletions

View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.147 2001/05/14 21:53:16 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.148 2001/05/15 01:12:58 momjian Exp $
*
*
* INTERFACE ROUTINES
@ -587,6 +587,7 @@ UpdateIndexRelation(Oid indexoid,
indexForm->indexrelid = indexoid;
indexForm->indrelid = heapoid;
indexForm->indproc = indexInfo->ii_FuncOid;
indexForm->indisclustered = false; /* not used */
indexForm->indislossy = islossy;
indexForm->indisunique = indexInfo->ii_Unique;
indexForm->indisprimary = primary;

View File

@ -15,8 +15,8 @@
*
*-------------------------------------------------------------------------
*/
#ifndef HAVE_DLOPEN
#include "postgres.h"
#ifndef HAVE_DLOPEN
extern char pg_pathname[];

View File

@ -37,7 +37,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: catversion.h,v 1.76 2001/05/15 00:00:15 tgl Exp $
* $Id: catversion.h,v 1.77 2001/05/15 01:12:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -53,6 +53,6 @@
*/
/* yyyymmddN */
#define CATALOG_VERSION_NO 200105143
#define CATALOG_VERSION_NO 200105144
#endif

View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: pg_index.h,v 1.17 2001/05/14 21:53:16 momjian Exp $
* $Id: pg_index.h,v 1.18 2001/05/15 01:12:59 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
@ -48,6 +48,10 @@ CATALOG(pg_index)
* index */
int2vector indkey;
oidvector indclass;
bool indisclustered; /* this is unused, but is referenced by
* the ODBC driver. Remove it someday.
* bjm 2001-05-14
*/
bool indislossy; /* do we fetch false tuples (lossy
* compression)? */
bool indhaskeytype; /* does key type != attribute type? */
@ -69,16 +73,17 @@ typedef FormData_pg_index *Form_pg_index;
* compiler constants for pg_index
* ----------------
*/
#define Natts_pg_index 10
#define Natts_pg_index 11
#define Anum_pg_index_indexrelid 1
#define Anum_pg_index_indrelid 2
#define Anum_pg_index_indproc 3
#define Anum_pg_index_indkey 4
#define Anum_pg_index_indclass 5
#define Anum_pg_index_indislossy 6
#define Anum_pg_index_indisunique 7
#define Anum_pg_index_indisprimary 8
#define Anum_pg_index_indreference 9
#define Anum_pg_index_indpred 10
#define Anum_pg_index_indisclustered 6
#define Anum_pg_index_indislossy 7
#define Anum_pg_index_indisunique 8
#define Anum_pg_index_indisprimary 9
#define Anum_pg_index_indreference 10
#define Anum_pg_index_indpred 11
#endif /* PG_INDEX_H */