bk commit into 5.1 tree (acurtis:1.2215)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2215 06/06/16 10:35:32 acurtis@stripped +6 -0
  fix WinXX build issues, reorder arguments to remove ambigious prototypes

  sql/sql_string.h
    1.63 06/06/16 10:35:27 acurtis@stripped +2 -4
    fix WinXX build issues, reorder arguments to remove ambigious prototypes

  sql/sql_string.cc
    1.94 06/06/16 10:35:27 acurtis@stripped +1 -1
    fix WinXX build issues, reorder arguments to remove ambigious prototypes

  sql/item_sum.cc
    1.180 06/06/16 10:35:27 acurtis@stripped +1 -1
    fix WinXX build issues, reorder arguments to remove ambigious prototypes

  sql/item_func.cc
    1.298 06/06/16 10:35:27 acurtis@stripped +4 -4
    fix WinXX build issues, reorder arguments to remove ambigious prototypes

  sql/item.cc
    1.195 06/06/16 10:35:27 acurtis@stripped +1 -1
    fix WinXX build issues, reorder arguments to remove ambigious prototypes

  sql/field.cc
    1.316 06/06/16 10:35:27 acurtis@stripped +1 -1
    fix WinXX build issues, reorder arguments to remove ambigious prototypes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	ltamd64.xiphis.org
# Root:	/home/antony/work2/fixwin-5.1

--- 1.315/sql/field.cc	2006-06-14 14:08:26 -07:00
+++ 1.316/sql/field.cc	2006-06-16 10:35:27 -07:00
@@ -7125,7 +7125,7 @@ int Field_blob::store(double nr)
 int Field_blob::store(longlong nr, bool unsigned_val)
 {
   CHARSET_INFO *cs=charset();
-  value.set(nr, unsigned_val, cs);
+  value.set(nr, cs, unsigned_val);
   return Field_blob::store(value.ptr(), (uint) value.length(), cs);
 }
 

--- 1.194/sql/item.cc	2006-06-14 14:08:26 -07:00
+++ 1.195/sql/item.cc	2006-06-16 10:35:27 -07:00
@@ -212,7 +212,7 @@ String *Item::val_string_from_int(String
   longlong nr= val_int();
   if (null_value)
     return 0;
-  str->set(nr, unsigned_flag, &my_charset_bin);
+  str->set(nr, &my_charset_bin, unsigned_flag);
   return str;
 }
 

--- 1.297/sql/item_func.cc	2006-06-14 14:08:27 -07:00
+++ 1.298/sql/item_func.cc	2006-06-16 10:35:27 -07:00
@@ -556,7 +556,7 @@ String *Item_int_func::val_str(String *s
   longlong nr=val_int();
   if (null_value)
     return 0;
-  str->set(nr, unsigned_flag, &my_charset_bin);
+  str->set(nr, &my_charset_bin, unsigned_flag);
   return str;
 }
 
@@ -698,7 +698,7 @@ String *Item_func_numhybrid::val_str(Str
     longlong nr= int_op();
     if (null_value)
       return 0; /* purecov: inspected */
-    str->set(nr, unsigned_flag, &my_charset_bin);
+    str->set(nr, &my_charset_bin, unsigned_flag);
     break;
   }
   case REAL_RESULT:
@@ -2052,7 +2052,7 @@ String *Item_func_min_max::val_str(Strin
     longlong nr=val_int();
     if (null_value)
       return 0;
-    str->set(nr, unsigned_flag, &my_charset_bin);
+    str->set(nr, &my_charset_bin, unsigned_flag);
     return str;
   }
   case DECIMAL_RESULT:
@@ -2838,7 +2838,7 @@ String *Item_func_udf_int::val_str(Strin
   longlong nr=val_int();
   if (null_value)
     return 0;
-  str->set(nr, unsigned_flag, &my_charset_bin);
+  str->set(nr, &my_charset_bin, unsigned_flag);
   return str;
 }
 

--- 1.179/sql/item_sum.cc	2006-06-14 14:08:27 -07:00
+++ 1.180/sql/item_sum.cc	2006-06-16 10:35:27 -07:00
@@ -1584,7 +1584,7 @@ Item_sum_hybrid::val_str(String *str)
     my_decimal2string(E_DEC_FATAL_ERROR, &sum_dec, 0, 0, 0, str);
     return str;
   case INT_RESULT:
-    str->set(sum_int, unsigned_flag, &my_charset_bin);
+    str->set(sum_int, &my_charset_bin, unsigned_flag);
     break;
   case ROW_RESULT:
   default:

--- 1.93/sql/sql_string.cc	2006-06-14 14:08:27 -07:00
+++ 1.94/sql/sql_string.cc	2006-06-16 10:35:27 -07:00
@@ -96,7 +96,7 @@ bool String::realloc(uint32 alloc_length
   return FALSE;
 }
 
-bool String::set(longlong num, bool unsigned_flag, CHARSET_INFO *cs)
+bool String::set(longlong num, CHARSET_INFO *cs, bool unsigned_flag)
 {
   uint l=20*cs->mbmaxlen+1;
   int base= unsigned_flag ? 10 : -10;

--- 1.62/sql/sql_string.h	2006-06-14 14:08:27 -07:00
+++ 1.63/sql/sql_string.h	2006-06-16 10:35:27 -07:00
@@ -139,11 +139,9 @@ public:
     }
     str_charset=cs;
   }
-  bool set(longlong num, bool unsigned_flag, CHARSET_INFO *cs);
-  bool set(longlong num, CHARSET_INFO *cs)
-  { return set(num, false, cs); }
+  bool set(longlong num, CHARSET_INFO *cs, bool unsigned_flag=false);
   bool set(ulonglong num, CHARSET_INFO *cs)
-  { return set((longlong)num, true, cs); }
+  { return set((longlong)num, cs, true); }
   bool set(double num,uint decimals, CHARSET_INFO *cs);
 
   /*