Merge 10.0-base -> 10.0

1 files changed, 4 insertions, 3 deletions

diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h
index 25b5918ef60..568cc91ecf7 100644
--- a/sql/sql_join_cache.h
+++ b/sql/sql_join_cache.h
@@ -63,6 +63,7 @@ typedef struct st_cache_field {
 
 class JOIN_TAB_SCAN;
 
+struct st_explain_bka_type;
 
 /*
   JOIN_CACHE is the base class to support the implementations of 
@@ -658,7 +659,7 @@ public:
   enum_nested_loop_state join_records(bool skip_last);
 
   /* Add a comment on the join algorithm employed by the join cache */
-  virtual void print_explain_comment(String *str);
+  virtual void save_explain_data(struct st_explain_bka_type *explain);
 
   THD *thd();
 
@@ -1336,7 +1337,7 @@ public:
   /* Check index condition of the joined table for a record from BKA cache */
   bool skip_index_tuple(range_id_t range_info);
 
-  void print_explain_comment(String *str);
+  void save_explain_data(struct st_explain_bka_type *explain);
 };
 
 
@@ -1427,5 +1428,5 @@ public:
   /* Check index condition of the joined table for a record from BKAH cache */
   bool skip_index_tuple(range_id_t range_info);
 
-  void print_explain_comment(String *str);
+  void save_explain_data(struct st_explain_bka_type *explain);
 };