Merge

sql/ha_ndbcluster.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

1 files changed, 5 insertions, 16 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 783e54ba144..b3fa73bb15b 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -360,18 +360,15 @@ public:
 };
 
 
-class Item_func_int_div :public Item_func
+class Item_func_int_div :public Item_int_func
 {
 public:
-  Item_func_int_div(Item *a,Item *b) :Item_func(a,b)
+  Item_func_int_div(Item *a,Item *b) :Item_int_func(a,b)
   {}
-  double val_real() { DBUG_ASSERT(fixed == 1); return (double) val_int(); }
   longlong val_int();
-  String *val_str(String*str);
   const char *func_name() const { return "DIV"; }
   void fix_length_and_dec();
   void print(String *str) { print_op(str); }
-  enum Item_result result_type () const { return INT_RESULT; }
 };
 
 
@@ -387,23 +384,15 @@ public:
 };
 
 
-class Item_func_signproc :public Item_func_num1
-{
-public:
-  Item_func_signproc(Item *a) :Item_func_num1(a) {}
-  Item_func_signproc(Item *a, Item *b) :Item_func_num1(a, b) {}
-  void fix_length_and_dec();
-};
-
-
-class Item_func_neg :public Item_func_signproc
+class Item_func_neg :public Item_func_num1
 {
 public:
-  Item_func_neg(Item *a) :Item_func_signproc(a) {}
+  Item_func_neg(Item *a) :Item_func_num1(a) {}
   double real_op();
   longlong int_op();
   my_decimal *decimal_op(my_decimal *);
   const char *func_name() const { return "-"; }
+  void fix_length_and_dec();
   void fix_num_length_and_dec();
 };