5.5 merge

1 files changed, 5 insertions, 1 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 01558603f68..a5bb12ae370 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -581,6 +581,9 @@ typedef struct system_variables
   ulong wt_timeout_long, wt_deadlock_search_depth_long;
 
   double long_query_time_double;
+
+  my_bool pseudo_slave_mode;
+
 } SV;
 
 /**
@@ -3366,6 +3369,7 @@ public:
 #else
   void begin_dataset() {}
 #endif
+  virtual void update_used_tables() {}
 };
 
 
@@ -4133,6 +4137,7 @@ public:
     return updated;
   }
   virtual void abort_result_set();
+  void update_used_tables();
 };
 
 class my_var : public Sql_alloc  {
@@ -4156,7 +4161,6 @@ public:
 
 class select_dumpvar :public select_result_interceptor {
   ha_rows row_count;
-  Item_func_set_user_var **set_var_items;
 public:
   List<my_var> var_list;
   select_dumpvar()  { var_list.empty(); row_count= 0;}