Renamed Arg_comparator::compare_int -> compare_int_signed

sql/item_cmpfunc.cc

@@ -317,7 +317,7 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
   }
   else if (type == INT_RESULT)
   {
-    if (func == &Arg_comparator::compare_int)
+    if (func == &Arg_comparator::compare_int_signed)
     {
       if ((*a)->unsigned_flag)
         func= ((*b)->unsigned_flag)? &Arg_comparator::compare_int_unsigned : 
@@ -432,7 +432,7 @@ int Arg_comparator::compare_e_real()
   return test(val1 == val2);
 }
 
-int Arg_comparator::compare_int()
+int Arg_comparator::compare_int_signed()
 {
   longlong val1= (*a)->val_int();
   if (!(*a)->null_value)

sql/item_cmpfunc.h

@@ -65,7 +65,7 @@ public:
   int compare_string();		 // compare args[0] & args[1]
   int compare_binary_string();	 // compare args[0] & args[1]
   int compare_real();            // compare args[0] & args[1]
-  int compare_int();             // compare args[0] & args[1]
+  int compare_int_signed();      // compare args[0] & args[1]
   int compare_int_signed_unsigned();
   int compare_int_unsigned_signed();
   int compare_int_unsigned();

sql/mysqld.cc

@@ -237,10 +237,10 @@ bool opt_help= 0;
 bool opt_verbose= 0;
 
 arg_cmp_func Arg_comparator::comparator_matrix[4][2] =
-{{&Arg_comparator::compare_string, &Arg_comparator::compare_e_string},
- {&Arg_comparator::compare_real, &Arg_comparator::compare_e_real},
- {&Arg_comparator::compare_int, &Arg_comparator::compare_e_int},
- {&Arg_comparator::compare_row, &Arg_comparator::compare_e_row}};
+{{&Arg_comparator::compare_string,     &Arg_comparator::compare_e_string},
+ {&Arg_comparator::compare_real,       &Arg_comparator::compare_e_real},
+ {&Arg_comparator::compare_int_signed, &Arg_comparator::compare_e_int},
+ {&Arg_comparator::compare_row,        &Arg_comparator::compare_e_row}};
 
 
 /* Global variables */