Merge of mysql-5.1-bugteam into mysql-trunk-merge.

1 files changed, 0 insertions, 7 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 45e98bb6100..7c865d6cae1 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -473,7 +473,6 @@ typedef struct system_variables
 
   double long_query_time_double;
 
-  LEX_USER current_user;
 } SV;
 
 
@@ -2717,10 +2716,6 @@ public:
   }
   void leave_locked_tables_mode();
   int decide_logging_format(TABLE_LIST *tables);
-  void set_current_user_used() { current_user_used= TRUE; }
-  bool is_current_user_used() { return current_user_used; }
-  void clean_current_user_used() { current_user_used= FALSE; }
-  void get_definer(LEX_USER *definer);
 private:
 
   /** The current internal error handler for this thread, or NULL. */
@@ -2743,8 +2738,6 @@ private:
   MEM_ROOT main_mem_root;
   Warning_info main_warning_info;
   Diagnostics_area main_da;
-
-  bool current_user_used;
 };