Merge 10.0-base -> 10.0

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 99c6f381692..fc931820dcd 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -59,6 +59,7 @@ void set_thd_stage_info(void *thd,
 
 class Reprepare_observer;
 class Relay_log_info;
+class Rpl_filter;
 
 class Query_log_event;
 class Load_log_event;
@@ -516,7 +517,10 @@ typedef struct system_variables
   ulong net_write_timeout;
   ulong optimizer_prune_level;
   ulong optimizer_search_depth;
+  ulong optimizer_use_condition_selectivity;
   ulong use_stat_tables;
+  ulong histogram_size;
+  ulong histogram_type;
   ulong preload_buff_size;
   ulong profiling_history_size;
   ulong read_buff_size;
@@ -1602,6 +1606,9 @@ public:
   /* Slave applier execution context */
   Relay_log_info* rli_slave;
 
+  /* Used to SLAVE SQL thread */
+  Rpl_filter* rpl_filter;
+
   void reset_for_next_command(bool calculate_userstat);
   /*
     Constant for THD::where initialization in the beginning of every query.
@@ -4140,6 +4147,7 @@ class Unique :public Sql_alloc
   uint size;
   uint full_size;
   uint min_dupl_count;   /* always 0 for unions, > 0 for intersections */
+  bool with_counters;
 
   bool merge(TABLE *table, uchar *buff, bool without_last_merge);