Merge branch 'PGPRO10' into PGPROEE10

Author: vbwagner

src/backend/access/nbtree/nbtsearch.c

@@ -1143,9 +1143,14 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 			 * We support the convention that sk_subtype == InvalidOid means
 			 * the opclass input type; this is a hack to simplify life for
 			 * ScanKeyInit().
+			 *
+			 * We do not require that included columns have opclass.
+			 * So do not try to find the comparison function for these
+			 * attributes.
 			 */
-			if (cur->sk_subtype == rel->rd_opcintype[i] ||
-				cur->sk_subtype == InvalidOid)
+			if (i < IndexRelationGetNumberOfKeyAttributes(rel) &&
+				(cur->sk_subtype == rel->rd_opcintype[i] ||
+				cur->sk_subtype == InvalidOid))
 			{
 				FmgrInfo   *procinfo;
 
@@ -1163,14 +1168,27 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 			{
 				RegProcedure cmp_proc;
 
-				cmp_proc = get_opfamily_proc(rel->rd_opfamily[i],
-											 rel->rd_opcintype[i],
-											 cur->sk_subtype,
-											 BTORDER_PROC);
-				if (!RegProcedureIsValid(cmp_proc))
-					elog(ERROR, "missing support function %d(%u,%u) for attribute %d of index \"%s\"",
-						 BTORDER_PROC, rel->rd_opcintype[i], cur->sk_subtype,
-						 cur->sk_attno, RelationGetRelationName(rel));
+				if (i < IndexRelationGetNumberOfKeyAttributes(rel))
+				{
+					cmp_proc = get_opfamily_proc(rel->rd_opfamily[i],
+												 rel->rd_opcintype[i],
+												 cur->sk_subtype,
+												 BTORDER_PROC);
+					if (!RegProcedureIsValid(cmp_proc))
+						elog(ERROR, "missing support function %d(%u,%u) for attribute %d of index \"%s\"",
+							BTORDER_PROC, rel->rd_opcintype[i], cur->sk_subtype,
+							cur->sk_attno, RelationGetRelationName(rel));
+				}
+				else
+				{
+					/*
+					 * We do not require that included columns have opclass.
+					 * So for included attributes scankey here can only
+					 * be SK_SEARCHNULL or SK_SEARCHNOTNULL
+					 * so it's ok to init scan key entry with invalid cmp_proc.
+					 */
+					cmp_proc = InvalidOid;
+				}
 				ScanKeyEntryInitialize(scankeys + i,
 									   cur->sk_flags,
 									   cur->sk_attno,