diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index f991f30e130..a22fa102905 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.123.2.6 2007/08/31 01:44:14 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.123.2.7 2007/10/04 20:44:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -138,6 +138,40 @@ build_base_rel_tlists(PlannerInfo *root, List *final_tlist)
 	}
 }
 
+/*
+ * add_IN_vars_to_tlists
+ *	  Add targetlist entries for each var needed in InClauseInfo entries
+ *	  to the appropriate base relations.
+ *
+ * Normally this is a waste of time because scanning of the WHERE clause
+ * will have added them.  But it is possible that eval_const_expressions()
+ * simplified away all references to the vars after the InClauseInfos were
+ * made.  We need the IN's righthand-side vars to be available at the join
+ * anyway, in case we try to unique-ify the subselect's outputs.  (The only
+ * known case that provokes this is "WHERE false AND foo IN (SELECT ...)".
+ * We don't try to be very smart about such cases, just correct.)
+ */
+void
+add_IN_vars_to_tlists(PlannerInfo *root)
+{
+	ListCell   *l;
+
+	foreach(l, root->in_info_list)
+	{
+		InClauseInfo *ininfo = (InClauseInfo *) lfirst(l);
+		List	   *in_vars;
+
+		in_vars = pull_var_clause((Node *) ininfo->sub_targetlist, false);
+		if (in_vars != NIL)
+		{
+			add_vars_to_targetlist(root, in_vars,
+								   bms_union(ininfo->lefthand,
+											 ininfo->righthand));
+			list_free(in_vars);
+		}
+	}
+}
+
 /*
  * add_vars_to_targetlist
  *	  For each variable appearing in the list, add it to the owning
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index e01379e8e3f..1dc9e97fdb6 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planmain.c,v 1.97 2006/10/04 00:29:54 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planmain.c,v 1.97.2.1 2007/10/04 20:44:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -178,6 +178,13 @@ query_planner(PlannerInfo *root, List *tlist, double tuple_fraction,
 
 	joinlist = deconstruct_jointree(root);
 
+	/*
+	 * Vars mentioned in InClauseInfo items also have to be added to baserel
+	 * targetlists.  Nearly always, they'd have got there from the original
+	 * WHERE qual, but in corner cases maybe not.
+	 */
+	add_IN_vars_to_tlists(root);
+
 	/*
 	 * Use the completed lists of equijoined keys to deduce any implied but
 	 * unstated equalities (for example, A=B and B=C imply A=C).
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index c4c9389af9d..24dd1840683 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/planmain.h,v 1.95 2006/08/12 02:52:06 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/planmain.h,v 1.95.2.1 2007/10/04 20:44:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,6 +69,7 @@ extern int	join_collapse_limit;
 
 extern void add_base_rels_to_query(PlannerInfo *root, Node *jtnode);
 extern void build_base_rel_tlists(PlannerInfo *root, List *final_tlist);
+extern void add_IN_vars_to_tlists(PlannerInfo *root);
 extern List *deconstruct_jointree(PlannerInfo *root);
 extern void process_implied_equality(PlannerInfo *root,
 						 Node *item1, Node *item2,