Merge with 4.0 to revert patch for BIGINT assignment to double

1 files changed, 5 insertions, 11 deletions

diff --git a/sql/item.cc b/sql/item.cc
index d5401b85755..4cd52c54097 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1192,17 +1192,11 @@ int Item_string::save_in_field(Field *field, bool no_conversions)
 
 int Item_uint::save_in_field(Field *field, bool no_conversions)
 {
-  longlong nr= val_int();
-  int res;
-
-  if (null_value)
-    return set_field_to_null(field);
-  field->set_notnull();
-  if (nr < 0)
-    res= field->store(ulonglong2double(nr);
-  else
-    res= field->store(nr);
-  return res ? -1 : 0;
+  /*
+    TODO: To be fixed when wen have a
+    field->store(longlong, unsigned_flag) method 
+  */
+  Item_int::save_in_field(field, no_conversions);
 }