Merge

bbbe3ac8 · Igor Babaev · 71e48fbf · dba8cfd5 · bbbe3ac8 · bbbe3ac8
Commit bbbe3ac8 authored Nov 05, 2010 by Igor Babaev
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 78 additions and 37 deletions

sql/sql_select.cc sql/sql_select.cc +76 -36

sql/sql_select.h sql/sql_select.h +2 -1

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -394,6 +394,7 @@ typedef struct st_join_table {
  }
  double get_partial_join_cardinality() { return partial_join_cardinality; }
  bool hash_join_is_possible();
+  int make_scan_filter();
 } JOIN_TAB;


@@ -1038,7 +1039,7 @@ class JOIN_CACHE :public Sql_alloc
  }   
  
  JOIN_TAB *get_next_table(JOIN_TAB *tab);
-
+  
  friend class JOIN_CACHE_HASHED;
  friend class JOIN_CACHE_BNL;
  friend class JOIN_CACHE_BKA;