summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-12-04 20:19:15 +0100
committerSergei Golubchik <serg@mariadb.org>2014-12-04 20:19:15 +0100
commit732d2daf448077a7d3ac88afaf1104f0ba4a9ba5 (patch)
tree8d7112b4236508edebf1b92253239a12b6fa3d9e /sql/field.cc
parent6ea90367431c5ff7d97530692cd711e5360bd98b (diff)
downloadmariadb-git-732d2daf448077a7d3ac88afaf1104f0ba4a9ba5.tar.gz
fix for 32-bit
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 3fa1f1c99c8..a6a2ad91c69 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -9285,8 +9285,8 @@ bool Create_field::check(THD *thd)
if (decimals >= NOT_FIXED_DEC)
{
- my_error(ER_TOO_BIG_SCALE, MYF(0), decimals, field_name,
- static_cast<ulong>(NOT_FIXED_DEC - 1));
+ my_error(ER_TOO_BIG_SCALE, MYF(0), static_cast<ulonglong>(decimals),
+ field_name, static_cast<ulong>(NOT_FIXED_DEC - 1));
DBUG_RETURN(TRUE);
}