Commit d4adb110 authored by Alexey Kopytov's avatar Alexey Kopytov

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

parents 39a28301 73b48dec
...@@ -3835,7 +3835,7 @@ int Field_longlong::store(double nr) ...@@ -3835,7 +3835,7 @@ int Field_longlong::store(double nr)
error= 1; error= 1;
} }
else else
res=(longlong) (ulonglong) nr; res=(longlong) double2ulonglong(nr);
} }
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment