From ed6998d0b3c0a6562217e5e9659752c8e7977295 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 15 May 2001 03:49:35 +0000
Subject: [PATCH] Re-add pg_index.indhaskeytype.

---
 src/backend/access/gist/gist.c   |  3 ++-
 src/backend/catalog/index.c      |  3 ++-
 src/include/catalog/catversion.h |  4 ++--
 src/include/catalog/pg_index.h   | 13 +++++++------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 3326cdecc7..8e7b530dea 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.74 2001/05/14 21:53:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.75 2001/05/15 03:49:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1127,6 +1127,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
 		elog(ERROR, "initGISTstate: index %u not found",
 			 RelationGetRelid(index));
 	itupform = (Form_pg_index) GETSTRUCT(htup);
+	giststate->haskeytype = itupform->indhaskeytype;
 	indexrelid = itupform->indexrelid;
 	ReleaseSysCache(htup);
 
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 237fa0f378..282df627b7 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.148 2001/05/15 01:12:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.149 2001/05/15 03:49:34 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -589,6 +589,7 @@ UpdateIndexRelation(Oid indexoid,
 	indexForm->indproc = indexInfo->ii_FuncOid;
 	indexForm->indisclustered = false;			/* not used */
 	indexForm->indislossy = islossy;
+	indexForm->indhaskeytype = true;			/* used by GIST */
 	indexForm->indisunique = indexInfo->ii_Unique;
 	indexForm->indisprimary = primary;
 	memcpy((char *) &indexForm->indpred, (char *) predText, predLen);
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 2f58b59a8b..44ddb7611a 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -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.77 2001/05/15 01:12:59 momjian Exp $
+ * $Id: catversion.h,v 1.78 2001/05/15 03:49:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200105144
+#define CATALOG_VERSION_NO	200105145
 
 #endif
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index d4c4fbc08a..3877f91783 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -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.18 2001/05/15 01:12:59 momjian Exp $
+ * $Id: pg_index.h,v 1.19 2001/05/15 03:49:35 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -73,7 +73,7 @@ typedef FormData_pg_index *Form_pg_index;
  *		compiler constants for pg_index
  * ----------------
  */
-#define Natts_pg_index					11
+#define Natts_pg_index					12
 #define Anum_pg_index_indexrelid		1
 #define Anum_pg_index_indrelid			2
 #define Anum_pg_index_indproc			3
@@ -81,9 +81,10 @@ typedef FormData_pg_index *Form_pg_index;
 #define Anum_pg_index_indclass			5
 #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
+#define Anum_pg_index_indhaskeytype		8
+#define Anum_pg_index_indisunique		9
+#define Anum_pg_index_indisprimary		10
+#define Anum_pg_index_indreference		11
+#define Anum_pg_index_indpred			12
 
 #endif	 /* PG_INDEX_H */