fix for 32-bit

MariaDB · Dec 4, 2014 · 732d2da · 732d2da
1 parent 6ea9036
commit 732d2da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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);
   }
 

diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
@@ -5469,8 +5469,8 @@ ER_SP_NO_RECURSION
         eng "Recursive stored functions and triggers are not allowed."
         ger "Rekursive gespeicherte Routinen und Triggers sind nicht erlaubt"
 ER_TOO_BIG_SCALE 42000 S1009
-        eng "Too big scale %u specified for '%-.192s'. Maximum is %lu."
-        ger "Zu großer Skalierungsfaktor %u für '%-.192s' angegeben. Maximum ist %lu"
+        eng "Too big scale %llu specified for '%-.192s'. Maximum is %u."
+        ger "Zu großer Skalierungsfaktor %llu für '%-.192s' angegeben. Maximum ist %u"
 ER_TOO_BIG_PRECISION 42000 S1009
         eng "Too big precision %llu specified for '%-.192s'. Maximum is %u."
         ger "Zu große Genauigkeit %llu für '%-.192s' angegeben. Maximum ist %u"