Merge branch '10.1' into 10.2

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/sql_select.h b/sql/sql_select.h
index ab5dc08e044..886a66c3ef4 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -604,6 +604,8 @@ typedef struct st_join_table {
             !(used_sjm_lookup_tables & ~emb_sj_nest->sj_inner_tables));
   }
 
+  bool keyuse_is_valid_for_access_in_chosen_plan(JOIN *join, KEYUSE *keyuse);
+
   void remove_redundant_bnl_scan_conds();
 
   void save_explain_data(Explain_table_access *eta, table_map prefix_tables, 
@@ -1120,6 +1122,11 @@ public:
     to materialize and access by lookups
   */
   table_map sjm_lookup_tables;
+  /** 
+    Bitmap of semijoin tables that the chosen plan decided
+    to materialize to scan the results of materialization
+  */
+  table_map sjm_scan_tables;
   /*
     Constant tables for which we have found a row (as opposed to those for
     which we didn't).
@@ -1488,6 +1495,7 @@ public:
     in_to_exists_having= NULL;
     emb_sjm_nest= NULL;
     sjm_lookup_tables= 0;
+    sjm_scan_tables= 0;
   }
 
   /* True if the plan guarantees that it will be returned zero or one row */