Merge mysql.com:/home/hf/work/22372/my50-22372

into  mysql.com:/home/hf/work/22372/my51-22372

1 files changed, 4 insertions, 2 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 4245d401f53..fa6a433a09e 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1609,10 +1609,11 @@ void Field_null::sql_type(String &res) const
   This is an number stored as a pre-space (or pre-zero) string
 ****************************************************************************/
 
-void
+int
 Field_decimal::reset(void)
 {
   Field_decimal::store(STRING_WITH_LEN("0"),&my_charset_bin);
+  return 0;
 }
 
 void Field_decimal::overflow(bool negative)
@@ -2257,9 +2258,10 @@ Field_new_decimal::Field_new_decimal(uint32 len_arg,
 }
 
 
-void Field_new_decimal::reset(void)
+int Field_new_decimal::reset(void)
 {
   store_value(&decimal_zero);
+  return 0;
 }