1 files changed, 6 insertions, 12 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index c3067ebc42b..54e4ac7e2f1 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -376,21 +376,14 @@ public:
 };
 
 
-class sys_var_enum_const :public sys_var
+class sys_var_enum_const :public sys_var_enum
 {
-  ulong SV::*offset;
-  TYPELIB *enum_names;
 public:
-  sys_var_enum_const(sys_var_chain *chain, const char *name_arg, ulong SV::*offset_arg,
-      TYPELIB *typelib, sys_after_update_func func)
-    :sys_var(name_arg,func), offset(offset_arg), enum_names(typelib)
-  { chain_sys_var(chain); }
-  bool check(THD *thd, set_var *var) { return 1; }
-  bool update(THD *thd, set_var *var) { return 1; }
-  SHOW_TYPE show_type() { return SHOW_CHAR; }
-  bool check_update_type(Item_result type) { return 1; }
+  sys_var_enum_const(sys_var_chain *chain, const char *name_arg,
+                     uint *value_arg, TYPELIB *typelib)
+    :sys_var_enum(chain, name_arg, value_arg, typelib, 0)
+  { }
   bool is_readonly() const { return 1; }
-  uchar *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base);
 };
 
 
@@ -1428,6 +1421,7 @@ public:
     my_free((uchar*) name, MYF(0));
   }
   friend bool process_key_caches(process_key_cache_t func);
+  friend int fill_key_cache_tables(THD *thd, TABLE_LIST *tables, COND *cond);
   friend void delete_elements(I_List<NAMED_LIST> *list,
 			      void (*free_element)(const char*, uchar*));
 };