cleanup

Item_func_format::print() was redundant
and other changes

1 files changed, 8 insertions, 10 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index f469b60c344..9c7dfc03aa3 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -93,7 +93,7 @@ public:
   {
     return val_str_from_val_str_ascii(str, &ascii_buf);
   }
-  virtual String *val_str_ascii(String *)= 0;
+  String *val_str_ascii(String *)= 0;
 };
 
 
@@ -490,7 +490,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "trim"; }
-  virtual void print(String *str, enum_query_type query_type);
+  void print(String *str, enum_query_type query_type);
   virtual const char *mode_name() const { return "both"; }
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_trim>(thd, mem_root, this); }
@@ -853,7 +853,6 @@ public:
   String *val_str_ascii(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "format"; }
-  virtual void print(String *str, enum_query_type query_type);
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_format>(thd, mem_root, this); }
 };
@@ -914,7 +913,6 @@ public:
   const char *func_name() const { return "binlog_gtid_pos"; }
   bool check_vcol_func_processor(void *arg)
   {
-
     return mark_unsupported_function(func_name(), "()", arg, VCOL_IMPOSSIBLE);
   }
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
@@ -1070,7 +1068,7 @@ public:
     collation.set(&my_charset_bin);
     max_length=args[0]->max_length;
   }
-  virtual void print(String *str, enum_query_type query_type);
+  void print(String *str, enum_query_type query_type);
   const char *func_name() const { return "cast_as_binary"; }
   bool need_parentheses_in_default() { return true; }
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
@@ -1214,7 +1212,7 @@ public:
   }
   void fix_length_and_dec();
   const char *func_name() const { return "convert"; }
-  virtual void print(String *str, enum_query_type query_type);
+  void print(String *str, enum_query_type query_type);
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_conv_charset>(thd, mem_root, this); }
 };
@@ -1230,7 +1228,7 @@ public:
   const char *func_name() const { return "collate"; }
   enum precedence precedence() const { return COLLATE_PRECEDENCE; }
   enum Functype functype() const { return COLLATE_FUNC; }
-  virtual void print(String *str, enum_query_type query_type);
+  void print(String *str, enum_query_type query_type);
   Item_field *field_for_view_update()
   {
     /* this function is transparent for view updating */
@@ -1412,8 +1410,8 @@ public:
   void fix_length_and_dec();
   const char *func_name() const{ return "column_create"; }
   String *val_str(String *);
-  virtual void print(String *str, enum_query_type query_type);
-  virtual enum Functype functype() const   { return DYNCOL_FUNC; }
+  void print(String *str, enum_query_type query_type);
+  enum Functype functype() const   { return DYNCOL_FUNC; }
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_dyncol_create>(thd, mem_root, this); }
 };
@@ -1427,7 +1425,7 @@ public:
   {}
   const char *func_name() const{ return "column_add"; }
   String *val_str(String *);
-  virtual void print(String *str, enum_query_type query_type);
+  void print(String *str, enum_query_type query_type);
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_dyncol_add>(thd, mem_root, this); }
 };