Fix incorrect access to pg_index.indcollation.

tglsfdc · tglsfdc · commit 149b2673c244 · 2011-03-06T12:10:50.000-05:00
Since this field is after a variable-length field, it can't simply be
accessed via the C struct for pg_index.  Fortunately, the relcache already
did the dirty work of pulling the information out to where it can be
accessed easily, so this is a one-line fix.

Andres Freund
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
@@ -872,8 +872,7 @@ index_getprocinfo(Relation irel,
 				 procnum, attnum, RelationGetRelationName(irel));
 
 		fmgr_info_cxt(procId, locinfo, irel->rd_indexcxt);
-		fmgr_info_collation(irel->rd_index->indcollation.values[attnum-1],
-							locinfo);
+		fmgr_info_collation(irel->rd_indcollation[attnum-1], locinfo);
 	}
 
 	return locinfo;

Original file line number	Diff line number	Diff line change
`@@ -872,8 +872,7 @@ index_getprocinfo(Relation irel,`
`872`	`872`	`procnum, attnum, RelationGetRelationName(irel));`
`873`	`873`
`874`	`874`	`fmgr_info_cxt(procId, locinfo, irel->rd_indexcxt);`
`875`		`- fmgr_info_collation(irel->rd_index->indcollation.values[attnum-1],`
`876`		`- locinfo);`
	`875`	`+ fmgr_info_collation(irel->rd_indcollation[attnum-1], locinfo);`
`877`	`876`	`}`
`878`	`877`
`879`	`878`	`return locinfo;`