Re-enable bushy plans. Vadim want them.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index c372e63e5df..746ec87eae1 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.15 1999/02/15 03:22:31 momjian Exp $
+ * $Id: internal.h,v 1.16 1999/02/16 00:41:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,9 +80,7 @@
 #define FLOAT_EQUAL(X,Y) ((X) - (Y) < TOLERANCE)
 #define FLOAT_IS_ZERO(X) (FLOAT_EQUAL(X,0.0))
 
-#ifdef NOT_USED
 extern int	BushyPlanFlag;
-#endif
 
 /* #define deactivate_joininfo(joininfo)		joininfo->inactive=true*/
 /*#define joininfo_inactive(joininfo)	joininfo->inactive */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 8f1b7873d24..4e1bfe3323c 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.19 1999/02/15 05:28:10 momjian Exp $
+ * $Id: paths.h,v 1.20 1999/02/16 00:41:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -85,11 +85,13 @@ extern List *make_rels_by_clauseless_joins(RelOptInfo *outer_rel,
 												List *inner_rels);
 extern RelOptInfo *make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo);
 extern List *new_join_tlist(List *tlist, List *other_relids,int first_resdomno);
+extern RelOptInfo *get_cheapest_complete_rel(List *join_rel_list);
 
 /*
  * prototypes for path/prune.c
  */
 extern void merge_rels_with_same_relids(List *rel_list);
 extern void rels_set_cheapest(List *rel_list);
+extern List *del_rels_all_bushy_inactive(List *old_rels);
 
 #endif	 /* PATHS_H */