Merge from mysql-5.0-bugteam to mysql-5.1-bugteam.

d4adb110 · Alexey Kopytov · 39a28301 · 73b48dec · d4adb110
Commit d4adb110 authored Dec 09, 2008 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/field.cc sql/field.cc +1 -1

No files found.
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -3835,7 +3835,7 @@ int Field_longlong::store(double nr)
      error= 1;
    }
    else
-      res=(longlong) (ulonglong) nr;
+      res=(longlong) double2ulonglong(nr);
  }
  else
  {