From 732d2daf448077a7d3ac88afaf1104f0ba4a9ba5 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 4 Dec 2014 20:19:15 +0100 Subject: [PATCH] fix for 32-bit --- sql/field.cc | 4 ++-- sql/share/errmsg-utf8.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 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(NOT_FIXED_DEC - 1)); + my_error(ER_TOO_BIG_SCALE, MYF(0), static_cast(decimals), + field_name, static_cast(NOT_FIXED_DEC - 1)); DBUG_RETURN(TRUE); } diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 653f053ba38..ef85496aa55 100644 --- 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"