Use -ieee alpha flag for gcc and egcs only.

2 files changed, 53 insertions, 33 deletions

diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index 73df64aaca6..4a7cfa7c471 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.21 1999/07/15 23:03:42 momjian Exp $
+ * $Id: indexing.h,v 1.22 1999/07/20 16:48:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,9 @@
 /*
  * Some definitions for indices on pg_attribute
  */
+#define Num_pg_amop_indices		2
 #define Num_pg_attr_indices		3
+#define Num_pg_index_indices	1
 #define Num_pg_proc_indices		3
 #define Num_pg_type_indices		2
 #define Num_pg_class_indices	2
@@ -32,22 +34,27 @@
 /*
  * Names of indices on system catalogs
  */
-#define AttributeNameIndex "pg_attribute_relid_attnam_index"
-#define AttributeNumIndex  "pg_attribute_relid_attnum_index"
+#define AccessMethodOpidIndex "pg_amop_opid_index"
+#define AccessMethodStrategyIndex "pg_amop_strategy_index"
+#define AttributeNameIndex 	"pg_attribute_relid_attnam_index"
+#define AttributeNumIndex  	"pg_attribute_relid_attnum_index"
 #define AttributeRelidIndex "pg_attribute_attrelid_index"
-#define ProcedureOidIndex  "pg_proc_oid_index"
-#define ProcedureNameIndex "pg_proc_proname_narg_type_index"
-#define ProcedureSrcIndex  "pg_proc_prosrc_index"
-#define TypeOidIndex	   "pg_type_oid_index"
-#define TypeNameIndex	   "pg_type_typname_index"
-#define ClassOidIndex	   "pg_class_oid_index"
-#define ClassNameIndex	   "pg_class_relname_index"
-#define AttrDefaultIndex   "pg_attrdef_adrelid_index"
-#define RelCheckIndex	   "pg_relcheck_rcrelid_index"
-#define TriggerRelidIndex  "pg_trigger_tgrelid_index"
+#define IndexRelidIndex 	"pg_index_indexrelid_index"
+#define ProcedureOidIndex  	"pg_proc_oid_index"
+#define ProcedureNameIndex 	"pg_proc_proname_narg_type_index"
+#define ProcedureSrcIndex  	"pg_proc_prosrc_index"
+#define TypeOidIndex	   	"pg_type_oid_index"
+#define TypeNameIndex	   	"pg_type_typname_index"
+#define ClassOidIndex	   	"pg_class_oid_index"
+#define ClassNameIndex	   	"pg_class_relname_index"
+#define AttrDefaultIndex   	"pg_attrdef_adrelid_index"
+#define RelCheckIndex	   	"pg_relcheck_rcrelid_index"
+#define TriggerRelidIndex  	"pg_trigger_tgrelid_index"
 #define DescriptionObjIndex "pg_description_objoid_index"
 
+extern char *Name_pg_amop_indices[];
 extern char *Name_pg_attr_indices[];
+extern char *Name_pg_index_indices[];
 extern char *Name_pg_proc_indices[];
 extern char *Name_pg_type_indices[];
 extern char *Name_pg_class_indices[];
@@ -56,6 +63,7 @@ extern char *Name_pg_relcheck_indices[];
 extern char *Name_pg_trigger_indices[];
 extern char *Name_pg_description_indices[];
 
+
 extern char *IndexedCatalogNames[];
 
 /*
@@ -71,16 +79,22 @@ extern void CatalogIndexInsert(Relation *idescs,
 				   HeapTuple heapTuple);
 extern bool CatalogHasIndex(char *catName, Oid catId);
 
-extern HeapTuple AttributeNameIndexScan(Relation heapRelation,
-					   Oid relid,
-					   char *attname);
 
+
+extern HeapTuple AccessMethodOpidIndexScan(Relation heapRelation,
+				  Oid claid, Oid opopr, Oid opid);
+extern HeapTuple AccessMethodStrategyIndexScan(Relation heapRelation,
+				  Oid opid, Oid claid, int2 opstrategy);
+extern HeapTuple AttributeNameIndexScan(Relation heapRelation,
+				   Oid relid,
+				   char *attname);
 extern HeapTuple AttributeNumIndexScan(Relation heapRelation,
-					  Oid relid,
-					  AttrNumber attnum);
+				  Oid relid,
+				  AttrNumber attnum);
+extern HeapTuple IndexRelidIndexScan(Relation heapRelation, Oid relid);
 extern HeapTuple ProcedureOidIndexScan(Relation heapRelation, Oid procId);
 extern HeapTuple ProcedureNameIndexScan(Relation heapRelation,
-					   char *procName, int2 nargs, Oid *argTypes);
+				   char *procName, int2 nargs, Oid *argTypes);
 extern HeapTuple ProcedureSrcIndexScan(Relation heapRelation, text *procSrc);
 extern HeapTuple TypeOidIndexScan(Relation heapRelation, Oid typeId);
 extern HeapTuple TypeNameIndexScan(Relation heapRelation, char *typeName);
@@ -88,6 +102,8 @@ extern HeapTuple ClassNameIndexScan(Relation heapRelation, char *relName);
 extern HeapTuple ClassOidIndexScan(Relation heapRelation, Oid relId);
 
 
+
+
 /*
  * What follows are lines processed by genbki.sh to create the statements
  * the bootstrap parser will turn into DefineIndex commands.
@@ -95,10 +111,15 @@ extern HeapTuple ClassOidIndexScan(Relation heapRelation, Oid relId);
  * The keyword is DECLARE_INDEX every thing after that is just like in a
  * normal specification of the 'define index' POSTQUEL command.
  */
+DECLARE_INDEX(pg_amop_opid_index on pg_amop using btree(amopclaid oid_ops, amopopr oid_ops, amopid oid_ops));
+DECLARE_INDEX(pg_amop_strategy_index on pg_amop using btree(amopid oid_ops, amopclaid oid_ops, amopstrategy int2_ops));
+
 DECLARE_INDEX(pg_attribute_relid_attnam_index on pg_attribute using btree(attrelid oid_ops, attname name_ops));
 DECLARE_INDEX(pg_attribute_relid_attnum_index on pg_attribute using btree(attrelid oid_ops, attnum int2_ops));
 DECLARE_INDEX(pg_attribute_attrelid_index on pg_attribute using btree(attrelid oid_ops));
 
+DECLARE_INDEX(pg_index_indexrelid_index on pg_index using btree(indrelid oid_ops));
+
 DECLARE_INDEX(pg_proc_oid_index on pg_proc using btree(oid oid_ops));
 DECLARE_INDEX(pg_proc_proname_narg_type_index on pg_proc using btree(proname name_ops, pronargs int2_ops, proargtypes oid8_ops));
 DECLARE_INDEX(pg_proc_prosrc_index on pg_proc using btree(prosrc text_ops));
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 14f888b76ce..5378b6319dc 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.15 1999/07/15 23:04:24 momjian Exp $
+ * $Id: syscache.h,v 1.16 1999/07/20 16:48:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,19 +46,18 @@
 #define TYPOID			13
 #define AMNAME			14
 #define CLANAME			15
-#define INDRELIDKEY		16
-#define INHRELID		17
-#define RULOID			18
-#define AGGNAME			19
-#define LISTENREL		20
-#define USENAME			21
-#define USESYSID		22
-#define GRONAME			23
-#define GROSYSID		24
-#define REWRITENAME		25
-#define PROSRC			26
-#define CLADEFTYPE		27
-#define LANOID			28
+#define INHRELID		16
+#define RULOID			17
+#define AGGNAME			18
+#define LISTENREL		19
+#define USENAME			20
+#define USESYSID		21
+#define GRONAME			22
+#define GROSYSID		23
+#define REWRITENAME		24
+#define PROSRC			25
+#define CLADEFTYPE		26
+#define LANOID			27
 
 /* ----------------
  *		struct cachedesc:		information needed for a call to InitSysCache()