Merge remote-tracking branch '5.5' into 10.0

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/sql_select.h b/sql/sql_select.h
index d51bca785a5..4f1b7bd7e05 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -534,6 +534,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();
 } JOIN_TAB;
 
@@ -1000,6 +1002,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).
@@ -1341,6 +1348,7 @@ public:
     pre_sort_join_tab= NULL;
     emb_sjm_nest= NULL;
     sjm_lookup_tables= 0;
+    sjm_scan_tables= 0;
 
     exec_saved_explain= false;
     /*