Merge mysql.com:/home/kostja/mysql/mysql-4.0-root

into mysql.com:/home/kostja/mysql/mysql-4.0-1790

1 files changed, 5 insertions, 4 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 5a5934db0cd..e18fa83e49d 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -104,12 +104,13 @@ Item_sum_num::val_str(String *str)
 String *
 Item_sum_int::val_str(String *str)
 {
-  longlong nr=val_int();
+  longlong nr= val_int();
   if (null_value)
     return 0;
-  char buff[21];
-  uint length= (uint) (longlong10_to_str(nr,buff,-10)-buff);
-  str->copy(buff,length);
+  if (unsigned_flag)
+    str->set((ulonglong) nr);
+  else
+    str->set(nr);
   return str;
 }