Merge 10.0-base -> 10.0

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/sql_select.h b/sql/sql_select.h
index c748a4f5101..22880a251aa 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -283,6 +283,9 @@ typedef struct st_join_table {
   /* Copy of POSITION::records_read, set by get_best_combination() */
   double       records_read;
   
+  /* The selectivity of the conditions that can be pushed to the table */ 
+  double        cond_selectivity;  
+  
   /* Startup cost for execution */
   double        startup_cost;
     
@@ -763,6 +766,9 @@ typedef struct st_position :public Sql_alloc
   */
   double records_read;
 
+  /* The selectivity of the pushed down conditions */
+  double cond_selectivity; 
+
   /* 
     Cost accessing the table in course of the entire complete join execution,
     i.e. cost of one access method use (e.g. 'range' or 'ref' scan ) times 
@@ -1811,6 +1817,8 @@ void eliminate_tables(JOIN *join);
 /* Index Condition Pushdown entry point function */
 void push_index_cond(JOIN_TAB *tab, uint keyno);
 
+#define OPT_LINK_EQUAL_FIELDS    1
+
 /****************************************************************************
   Temporary table support for SQL Runtime
  ***************************************************************************/