summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2004-11-10 18:16:58 +0300
committerunknown <gluh@gluh.mysql.r18.ru>2004-11-10 18:16:58 +0300
commitc3a066e4035a16a666e71a55f47c14c29649e580 (patch)
tree0378e2cbc3f7e2305a27e2f6c50362eba4f23017 /sql/field.cc
parent81880bab136d5df8cfdc47a953cff1442adb11f6 (diff)
downloadmariadb-git-c3a066e4035a16a666e71a55f47c14c29649e580.tar.gz
Fix for bug #6077: Problem with make test from 4.1.7 and bk
portability fix(UnixWare) mysql-test/r/ps_1general.result: portability fix(UnixWare) mysql-test/t/key_cache.test: portability fix(UnixWare) mysql-test/t/ps_1general.test: portability fix(UnixWare) sql/field.cc: portability fix(UnixWare)
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index deb38048d42..569d11eb758 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -2145,7 +2145,7 @@ int Field_longlong::store(double nr)
set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
error= 1;
}
- else if (nr >= (double) LONGLONG_MAX)
+ else if (nr >= (double) (ulonglong) LONGLONG_MAX)
{
res=(longlong) LONGLONG_MAX;
set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);