Merge lp:~tsarev/percona-server/18205_07_slave_type_conversions_error_on_truncate.patch into lp:percona-server/rnt-5.1

[Oleg Tsarev]

I renamed <name>_truncated methods to <name>, and "truncated" argument now has default value (0). I removed <name> methods, because their usage exactly correlate with new methods.

bzr branch lp:~tsarev/percona-server/18205_07_slave_type_conversions_error_on_truncate.patch-refactoring && cd 18205_07_slave_type_conversions_error_on_truncate.patch-refactoring && ONE=216 && TWO=217 && rm -rf ${ONE} && bzr update -r ${ONE} && make main && mv Percona-Server-5.1.59-rel13.0 ${ONE} && rm ${ONE}/patches && rm -rf ${ONE}/.pc && rm -rf ${TWO} && bzr update -r ${TWO} && make main && mv Percona-Server-5.1.59-rel13.0 ${TWO} && rm ${TWO}/patches && rm -rf ${TWO}/.pc && diff -ruN ${ONE} ${TWO}

http://pastebin.com/KdtVAM37

[Oleg Tsarev (tsarev)]

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/256/

[Laurynas Biveinis (laurynas-biveinis)]

Please replace default arg value 0 with NULL.
Line 19: space after error comma
Lines 2097--2099: indentation.

review: Needs Fixing

[Oleg Tsarev (tsarev)]

Fixed

review: Needs Resubmitting

[Alexey Kopytov (akopytov)]

Don't touch upstream code unless you really have to. Fixing some whitespace in the upstream code is just not worth possible merge conflicts in the future.

That is, remove the following:

> -@@ -6027,8 +6539,13 @@
> +@@ -5908,8 +6407,7 @@
> + char buff[MAX_DATE_STRING_REP_LENGTH];
> + String str(buff, sizeof(buff), &my_charset_latin1);
> + make_datetime((DATE_TIME_FORMAT *) 0, ltime, &str);
> +- set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_NOTE,
> +- WARN_DATA_TRUNCATED,
> ++ set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_NOTE, WARN_DATA_TRUNCATED,
> + str.ptr(), str.length(), MYSQL_TIMESTAMP_DATE, 1);
> + error= 3;
> + }
> +@@ -6027,8 +6525,13 @@
> ** Stored as a 8 byte unsigned int. Should sometimes be change to a 6 byte int.

and this

> -@@ -7096,8 +7665,13 @@
> +@@ -6608,7 +7164,7 @@
> + String tmp(buf, sizeof(buf), cs);
> + tmp.copy((char*) ptr, field_length, cs);
> + push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
> +- ER_TRUNCATED_WRONG_VALUE,
> ++ ER_TRUNCATED_WRONG_VALUE,
> + ER(ER_TRUNCATED_WRONG_VALUE),
> + "DOUBLE", tmp.c_ptr());
> + }
> +@@ -6626,7 +7182,7 @@
> +
> + result= my_strntoll(cs, (char*) ptr,field_length,10,&end,&error);
> + if (!table->in_use->no_errors &&
> +- (error || (field_length != (uint32)(end - (char*) ptr) &&
> ++ (error || (field_length != (uint32)(end - (char*) ptr) &&
> + !check_if_only_end_space(cs, end,
> + (char*) ptr + field_length))))
> + {
> +@@ -6634,7 +7190,7 @@
> + String tmp(buf, sizeof(buf), cs);
> + tmp.copy((char*) ptr, field_length, cs);
> + push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
> +- ER_TRUNCATED_WRONG_VALUE,
> ++ ER_TRUNCATED_WRONG_VALUE,
> + ER(ER_TRUNCATED_WRONG_VALUE),
> + "INTEGER", tmp.c_ptr());
> + }
> +@@ -6673,7 +7229,7 @@
> + String tmp(buf, sizeof(buf), cs);
> + tmp.copy((char*) ptr, field_length, cs);
> + push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
> +- ER_TRUNCATED_WRONG_VALUE,
> ++ ER_TRUNCATED_WRONG_VALUE,
> + ER(ER_TRUNCATED_WRONG_VALUE),
> + "DECIMAL", tmp.c_ptr());
> + }
> +@@ -7095,8 +7651,13 @@
> return 2;

and this

> -@@ -8553,32 +9167,50 @@
> +@@ -8533,7 +9134,7 @@
> +
> + /* Convert character set if necessary */
> + if (String::needs_conversion(length, cs, field_charset, &not_used))
> +- {
> ++ {
> + uint dummy_errors;
> + tmpstr.copy(from, length, cs, field_charset, &dummy_errors);
> + from= tmpstr.ptr();
> +@@ -8552,32 +9153,50 @@
> tmp=(uint) my_strntoul(cs,from,length,10,&end,&err);

and this

> - tmp=0;
> +- tmp=0;
> ++ tmp=0;
> + if (truncated)

and this

> +@@ -9097,15 +9736,20 @@
> + }
> +
> +
> +-uint Field_bit::is_equal(Create_field *new_field)
> ...

review: Needs Fixing

[Oleg Tsarev (tsarev)]

Fixed

review: Needs Resubmitting

[Alexey Kopytov (akopytov)]

I took a closer look at slave_type_conversions_error_on_truncate.patch. I think it's implemented in a wrong way. But it doesn't make sense to discuss it here, since this MP is only about cosmetic changes. Will be discussed when merging into the main 5.1 branch.

review: Approve

[Oleg Tsarev (tsarev)]

Better discuss right now here, because I want merge three patches:
 * wl5151.patch
 * slave_type_conversions_error_on_truncate.patch
 * replication_slave_skip_columns.patch
together.
Test related to this three patches intersected and hard to split this tests separated to every patch.

I see two possible solutions:
1) I split tests related to each patch
2) We discuss patch here, I prepare additional proposal with implementation not a wrong way, I merge patches together and propose for merge to 5.1

Way (2) allows to save my time to split tests.
Discussion about correct implementation required anycase, and better discuss as soon, as possible.

review: Needs Information

[Alexey Kopytov (akopytov)]

What about adding a truncated flag to the base Field class, and setting it in Field_*::store() if truncation occurs? This way we don't have to make invasive changes in all Field_*::store() signatures and implementation.

But even that doesn't seem necessary at a glance. Field_*::store() returns 1 on truncation. But it must be verified that Field_*::store() returns 1 if and only if 'truncated' would be set to TRUE by the current patch. And if there are differences, it must be checked whether it's a bug in the patch, or we do have valid cases when Field_*::store() reports an error, but the patch doesn't want to consider it as truncation for whatever reasons.

[Alexey Kopytov (akopytov)]

I also see a number of unnecessary changes in the upstream code. Like this:

> @@ -7652,8 +7652,12 @@
> THD* old_thd= table->in_use;
> if (!table->in_use)
> table->in_use= thd;
> -
> error= do_exec_row(rli);
> + if(ER_SLAVE_CONVERSION_WITHOUT_TRUNCATE_FAILED == error)

or this:

> @@ -2777,22 +2929,31 @@
> nr, unsigned_val, &decimal_value)))
> {
> if (check_overflow(err))
> + {
> set_value_on_overflow(&decimal_value, decimal_value.sign());
> + }

There is nothing wrong with existing code according to the guidelines. But even if there was, it's not a good idea to fix it.

Another suspicious change:

> @@ -9242,7 +9246,6 @@
>
> if (error && !thd->is_error())
> {
> - DBUG_ASSERT(0);
> my_error(ER_UNKNOWN_ERROR, MYF(0));
> }

What's that for?

[Alexey Kopytov (akopytov)]

Another thought is that those 3 patches should be submitted for review separately, no matter what.

Every one of them is big and invasive enough to make reviews non-trivial. A merged patch will be impossible to review.

Dependencies are not a problem. You can just submit 3 dependent MPs.

=== modified file 'patches/slave_type_conversions_error_on_truncate.patch'
--- patches/slave_type_conversions_error_on_truncate.patch	2012-02-12 03:52:34 +0000
+++ patches/slave_type_conversions_error_on_truncate.patch	2012-02-17 10:41:17 +0000
@@ -7,15 +7,14 @@
 # should be done or reviewed by the maintainer!
 --- a/sql/field.cc
 +++ b/sql/field.cc
-@@ -1123,15 +1123,24 @@
+@@ -1123,15 +1123,23 @@
      2   error: garbage at the end of string.
  */
  
 -int Field_num::check_int(CHARSET_INFO *cs, const char *str, int length, 
 -                         const char *int_end, int error)
-+int Field_num::check_int_truncated(CHARSET_INFO *cs, const char *str,
-+                                   int length, const char *int_end, int error,
-+                                   bool *truncated)
++int Field_num::check_int(CHARSET_INFO *cs, const char *str, int length,
++                         const char *int_end, int error, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -34,7 +33,7 @@
      push_warning_printf(table->in_use, MYSQL_ERROR::WARN_LEVEL_WARN,
                          ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, 
                          ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
-@@ -1142,6 +1151,10 @@
+@@ -1142,6 +1150,10 @@
    /* Test if we have garbage at the end of the given string. */
    if (test_if_important_data(cs, int_end, str + length))
    {
@@ -45,17 +44,15 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
      return 2;
    }
-@@ -1172,10 +1185,15 @@
-     1   error
+@@ -1173,9 +1185,14 @@
  */
  
--bool Field_num::get_int(CHARSET_INFO *cs, const char *from, uint len,
+ bool Field_num::get_int(CHARSET_INFO *cs, const char *from, uint len,
 -                        longlong *rnd, ulonglong unsigned_max, 
 -                        longlong signed_min, longlong signed_max)
-+bool Field_num::get_int_truncated(CHARSET_INFO *cs, const char *from, uint len,
-+                                  longlong *rnd, ulonglong unsigned_max, 
-+                                  longlong signed_min, longlong signed_max,
-+                                  bool *truncated)
++                        longlong *rnd, ulonglong unsigned_max,
++                        longlong signed_min, longlong signed_max,
++                        bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -64,7 +61,7 @@
    char *end;
    int error;
    
-@@ -1210,6 +1228,10 @@
+@@ -1210,6 +1227,10 @@
    return 0;
  
  out_of_range:
@@ -75,26 +72,24 @@
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
    return 1;
  }
-@@ -1226,8 +1248,9 @@
+@@ -1226,8 +1247,9 @@
      0  no error or some other errors except overflow
  */
  
 -int Field::warn_if_overflow(int op_result)
-+int Field::warn_if_overflow_truncated(int op_result, bool *truncated)
++int Field::warn_if_overflow(int op_result, bool *truncated)
  {
-+  if_overflow_truncated(op_result, truncated);
++  if_overflow(op_result, truncated);
    if (op_result == E_DEC_OVERFLOW)
    {
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
-@@ -1609,29 +1632,42 @@
-   @return
+@@ -1610,28 +1632,37 @@
      value converted from val
  */
--longlong Field::convert_decimal2longlong(const my_decimal *val,
+ longlong Field::convert_decimal2longlong(const my_decimal *val,
 -                                         bool unsigned_flag, int *err)
-+longlong Field::convert_decimal2longlong_truncated(const my_decimal *val,
-+                                                   bool unsigned_flag, int *err,
-+                                                   bool *truncated)
++                                         bool unsigned_flag, int *err,
++                                         bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -116,11 +111,9 @@
 -    else if (warn_if_overflow(my_decimal2int(E_DEC_ERROR &
 -                                           ~E_DEC_OVERFLOW & ~E_DEC_TRUNCATED,
 -                                           val, TRUE, &i)))
-+    else if (warn_if_overflow_truncated(my_decimal2int(E_DEC_ERROR &
-+                                                       ~E_DEC_OVERFLOW &
-+                                                       ~E_DEC_TRUNCATED,
-+                                                       val, TRUE, &i),
-+                                        truncated))
++    else if (warn_if_overflow(my_decimal2int(E_DEC_ERROR & ~E_DEC_OVERFLOW &
++                                             ~E_DEC_TRUNCATED, val, TRUE, &i),
++                              truncated))
      {
        i= ~(longlong) 0;
        *err= 1;
@@ -129,30 +122,28 @@
 -  else if (warn_if_overflow(my_decimal2int(E_DEC_ERROR &
 -                                         ~E_DEC_OVERFLOW & ~E_DEC_TRUNCATED,
 -                                         val, FALSE, &i)))
-+  else if (warn_if_overflow_truncated(my_decimal2int(E_DEC_ERROR &
-+                                                     ~E_DEC_OVERFLOW &
-+                                                     ~E_DEC_TRUNCATED,
-+                                                     val, FALSE, &i),
-+                                      truncated))
++  else if (warn_if_overflow(my_decimal2int(E_DEC_ERROR & ~E_DEC_OVERFLOW &
++                                           ~E_DEC_TRUNCATED, val, FALSE, &i),
++                            truncated))
    {
      i= (val->sign() ? LONGLONG_MIN : LONGLONG_MAX);
      *err= 1;
-@@ -1654,12 +1690,19 @@
+@@ -1654,12 +1685,19 @@
      !=0  error
  */
  
 -int Field_num::store_decimal(const my_decimal *val)
-+int Field_num::store_decimal_truncated(const my_decimal *val, bool *truncated)
++int Field_num::store_decimal(const my_decimal *val, bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
 -  int err= 0;
 -  longlong i= convert_decimal2longlong(val, unsigned_flag, &err);
 -  return test(err | store(i, unsigned_flag));
 +  int err=         0;
-+  longlong i=      convert_decimal2longlong_truncated(val, unsigned_flag,
-+                                                      &err, truncated);
++  longlong i=      convert_decimal2longlong(val, unsigned_flag, &err,
++                                            truncated);
 +  bool truncated2= false;
-+  int result=      test(err | store_truncated(i, unsigned_flag, &truncated2));
++  int result=      test(err | store(i, unsigned_flag, &truncated2));
 +  if (truncated)
 +  {
 +    *truncated= *truncated || truncated2;
@@ -161,12 +152,12 @@
  }
  
  
-@@ -1726,14 +1769,20 @@
+@@ -1726,14 +1764,20 @@
      !=0  error
  */
  
 -int Field_str::store_decimal(const my_decimal *d)
-+int Field_str::store_decimal_truncated(const my_decimal *d, bool *truncated)
++int Field_str::store_decimal(const my_decimal *d, bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    double val;
@@ -175,9 +166,9 @@
 -                                            ~E_DEC_OVERFLOW, d, &val));
 -  return err | store(val);
 +  int err= my_decimal2double(E_DEC_FATAL_ERROR & ~E_DEC_OVERFLOW, d, &val);
-+  err= warn_if_overflow_truncated(err, truncated);
++  err= warn_if_overflow(err, truncated);
 +  bool truncated2= false;
-+  int result= err | store_truncated(val, &truncated2);
++  int result= err | store(val, &truncated2);
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -186,13 +177,13 @@
  }
  
  
-@@ -1929,8 +1979,13 @@
+@@ -1929,8 +1973,13 @@
  }
  
  
 -int Field_decimal::store(const char *from_arg, uint len, CHARSET_INFO *cs)
-+int Field_decimal::store_truncated(const char *from_arg, uint len,
-+                                   CHARSET_INFO *cs, bool *truncated)
++int Field_decimal::store(const char *from_arg, uint len, CHARSET_INFO *cs,
++                         bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -201,7 +192,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    char buff[STRING_BUFFER_USUAL_SIZE];
    String tmp(buff,sizeof(buff), &my_charset_bin);
-@@ -2003,6 +2058,10 @@
+@@ -2003,6 +2052,10 @@
      from++;
    if (from == end)
    {
@@ -212,7 +203,7 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
      is_cuted_fields_incr=1;
    }
-@@ -2018,6 +2077,10 @@
+@@ -2018,6 +2071,10 @@
      { 
        if (sign_char=='-')
        {
@@ -223,7 +214,7 @@
          Field_decimal::overflow(1);
          return 1;
        }
-@@ -2079,6 +2142,10 @@
+@@ -2079,6 +2136,10 @@
      for (;from != end && my_isspace(&my_charset_bin, *from); from++) ;
      if (from != end)                     // If still something left, warn
      {
@@ -234,7 +225,7 @@
        set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
        is_cuted_fields_incr=1;
      }
-@@ -2163,6 +2230,10 @@
+@@ -2163,6 +2224,10 @@
    if (field_length < tmp_uint + (int) (sign_char == '-')) 
    {
      // too big number, change to max or min number
@@ -245,7 +236,7 @@
      Field_decimal::overflow(sign_char == '-');
      return 1;
    }
-@@ -2257,8 +2328,14 @@
+@@ -2257,8 +2322,14 @@
          if (tmp_char != '0')			// Losing a non zero digit ?
          {
            if (!is_cuted_fields_incr)
@@ -260,7 +251,7 @@
            return 0;
          }
          continue;
-@@ -2280,6 +2357,10 @@
+@@ -2280,6 +2351,10 @@
              This is a note, not a warning, as we don't want to abort
              when we cut decimals in strict mode
            */
@@ -271,12 +262,12 @@
  	  set_warning(MYSQL_ERROR::WARN_LEVEL_NOTE, WARN_DATA_TRUNCATED, 1);
          }
          return 0;
-@@ -2295,17 +2376,29 @@
+@@ -2295,17 +2370,29 @@
  }
  
  
 -int Field_decimal::store(double nr)
-+int Field_decimal::store_truncated(double nr, bool *truncated)
++int Field_decimal::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -302,12 +293,12 @@
      overflow(nr < 0.0);
      return 1;
    }
-@@ -2340,8 +2433,12 @@
+@@ -2340,8 +2427,12 @@
  }
  
  
 -int Field_decimal::store(longlong nr, bool unsigned_val)
-+int Field_decimal::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_decimal::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -316,7 +307,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    char buff[22];
    uint length, int_part;
-@@ -2350,6 +2447,10 @@
+@@ -2350,6 +2441,10 @@
  
    if (nr < 0 && unsigned_flag && !unsigned_val)
    {
@@ -327,13 +318,13 @@
      overflow(1);
      return 1;
    }
-@@ -2620,8 +2721,13 @@
+@@ -2620,8 +2715,13 @@
      1 error
  */
  
 -bool Field_new_decimal::store_value(const my_decimal *decimal_value)
-+bool Field_new_decimal::store_value_truncated(const my_decimal *decimal_value,
-+                                              bool *truncated)
++bool Field_new_decimal::store_value(const my_decimal *decimal_value,
++                                    bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -342,7 +333,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    DBUG_ENTER("Field_new_decimal::store_value");
-@@ -2636,6 +2742,10 @@
+@@ -2636,6 +2736,10 @@
    if (unsigned_flag && decimal_value->sign())
    {
      DBUG_PRINT("info", ("unsigned overflow"));
@@ -353,29 +344,22 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
      error= 1;
      decimal_value= &decimal_zero;
-@@ -2649,8 +2759,11 @@
-   }
+@@ -2650,7 +2754,8 @@
  #endif
  
--  if (warn_if_overflow(my_decimal2binary(E_DEC_FATAL_ERROR & ~E_DEC_OVERFLOW,
+   if (warn_if_overflow(my_decimal2binary(E_DEC_FATAL_ERROR & ~E_DEC_OVERFLOW,
 -                                         decimal_value, ptr, precision, dec)))
-+  if (warn_if_overflow_truncated(my_decimal2binary(E_DEC_FATAL_ERROR &
-+                                                   ~E_DEC_OVERFLOW,
-+                                                   decimal_value, ptr,
-+                                                   precision, dec),
-+                                 truncated))
++                                         decimal_value, ptr, precision, dec),
++                       truncated))
    {
      my_decimal buff;
      DBUG_PRINT("info", ("overflow"));
-@@ -2664,9 +2777,14 @@
- }
- 
- 
--int Field_new_decimal::store(const char *from, uint length,
+@@ -2665,8 +2770,12 @@
+ 
+ 
+ int Field_new_decimal::store(const char *from, uint length,
 -                             CHARSET_INFO *charset_arg)
-+int Field_new_decimal::store_truncated(const char *from, uint length,
-+                                       CHARSET_INFO *charset_arg,
-+                                       bool *truncated)
++                             CHARSET_INFO *charset_arg, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -384,7 +368,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int err;
    my_decimal decimal_value;
-@@ -2682,6 +2800,10 @@
+@@ -2682,6 +2791,10 @@
      String from_as_str;
      from_as_str.copy(from, length, &my_charset_bin);
  
@@ -395,7 +379,7 @@
      push_warning_printf(table->in_use, MYSQL_ERROR::WARN_LEVEL_ERROR,
                          ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
                          ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
-@@ -2693,9 +2815,17 @@
+@@ -2693,9 +2806,17 @@
  
    switch (err) {
    case E_DEC_TRUNCATED:
@@ -413,13 +397,13 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
      set_value_on_overflow(&decimal_value, decimal_value.sign());
      break;
-@@ -2721,7 +2851,12 @@
+@@ -2721,7 +2842,12 @@
    DBUG_PRINT("enter", ("value: %s",
                         dbug_decimal_as_string(dbug_buff, &decimal_value)));
  #endif
 -  store_value(&decimal_value);
 +  bool truncated2= false;
-+  store_value_truncated(&decimal_value, &truncated2);
++  store_value(&decimal_value, &truncated2);
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -427,12 +411,12 @@
    DBUG_RETURN(err);
  }
  
-@@ -2732,8 +2867,12 @@
+@@ -2732,8 +2858,12 @@
    will return E_DEC_TRUNCATED always correctly
  */
  
 -int Field_new_decimal::store(double nr)
-+int Field_new_decimal::store_truncated(double nr, bool *truncated)
++int Field_new_decimal::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -441,11 +425,11 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    my_decimal decimal_value;
    int err;
-@@ -2745,30 +2884,53 @@
+@@ -2745,30 +2875,52 @@
      TODO: fix following when double2my_decimal when double2decimal
      will return E_DEC_TRUNCATED always correctly
    */
-+  if_overflow_truncated(err, truncated);
++  if_overflow(err, truncated);
    if (!err)
    {
      double nr2;
@@ -474,7 +458,7 @@
    }
 -  if (store_value(&decimal_value))
 +  bool truncated2= false;
-+  if (store_value_truncated(&decimal_value, &truncated2))
++  if (store_value(&decimal_value, &truncated2))
      err= 1;
    else if (err && !table->in_use->got_warning)
      err= warn_if_overflow(err);
@@ -487,8 +471,7 @@
  
  
 -int Field_new_decimal::store(longlong nr, bool unsigned_val)
-+int Field_new_decimal::store_truncated(longlong nr, bool unsigned_val,
-+                                       bool *truncated)
++int Field_new_decimal::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -497,20 +480,20 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    my_decimal decimal_value;
    int err;
-@@ -2777,22 +2938,31 @@
+@@ -2777,22 +2929,31 @@
                             nr, unsigned_val, &decimal_value)))
    {
      if (check_overflow(err))
 +    {
        set_value_on_overflow(&decimal_value, decimal_value.sign());
 +    }
-+    if_overflow_truncated(err, truncated);
++    if_overflow(err, truncated);
      /* Only issue a warning if store_value doesn't issue an warning */
      table->in_use->got_warning= 0;
    }
 -  if (store_value(&decimal_value))
 +  bool truncated2= false;
-+  if (store_value_truncated(&decimal_value, &truncated2))
++  if (store_value(&decimal_value, &truncated2))
      err= 1;
    else if (err && !table->in_use->got_warning)
      err= warn_if_overflow(err);
@@ -523,36 +506,36 @@
  
  
 -int Field_new_decimal::store_decimal(const my_decimal *decimal_value)
-+int Field_new_decimal::store_decimal_truncated(const my_decimal *decimal_value,
-+                                               bool *truncated)
++int Field_new_decimal::store_decimal(const my_decimal *decimal_value,
++                                     bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
 -  return store_value(decimal_value);
-+  return store_value_truncated(decimal_value, truncated);
++  return store_value(decimal_value, truncated);
  }
  
  
-@@ -3023,20 +3193,25 @@
+@@ -3023,20 +3184,25 @@
  ** tiny int
  ****************************************************************************/
  
 -int Field_tiny::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_tiny::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                bool *truncated)
++int Field_tiny::store(const char *from, uint len, CHARSET_INFO *cs,
++                      bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error;
    longlong rnd;
    
 -  error= get_int(cs, from, len, &rnd, 255, -128, 127);
-+  error= get_int_truncated(cs, from, len, &rnd, 255, -128, 127, truncated);
++  error= get_int(cs, from, len, &rnd, 255, -128, 127, truncated);
    ptr[0]= unsigned_flag ? (char) (ulonglong) rnd : (char) rnd;
    return error;
  }
  
  
 -int Field_tiny::store(double nr)
-+int Field_tiny::store_truncated(double nr, bool *truncated)
++int Field_tiny::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -561,7 +544,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    nr=rint(nr);
-@@ -3045,12 +3220,20 @@
+@@ -3045,12 +3211,20 @@
      if (nr < 0.0)
      {
        *ptr=0;
@@ -582,7 +565,7 @@
        set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
        error= 1;
      }
-@@ -3062,12 +3245,20 @@
+@@ -3062,12 +3236,20 @@
      if (nr < -128.0)
      {
        *ptr= (char) -128;
@@ -603,12 +586,12 @@
        set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
        error= 1;
      }
-@@ -3078,8 +3269,12 @@
+@@ -3078,8 +3260,12 @@
  }
  
  
 -int Field_tiny::store(longlong nr, bool unsigned_val)
-+int Field_tiny::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_tiny::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -617,7 +600,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
  
-@@ -3088,13 +3283,11 @@
+@@ -3088,13 +3274,11 @@
      if (nr < 0 && !unsigned_val)
      {
        *ptr= 0;
@@ -631,7 +614,7 @@
        error= 1;
      }
      else
-@@ -3107,18 +3300,24 @@
+@@ -3107,18 +3291,24 @@
      if (nr < -128)
      {
        *ptr= (char) -128;
@@ -649,22 +632,22 @@
    }
 +  if (1 == error)
 +  {
-+    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 +    if (truncated)
 +    {
 +      *truncated= true;
 +    }
++    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 +  }
    return error;
  }
  
-@@ -3198,14 +3397,16 @@
+@@ -3198,14 +3388,16 @@
   Field type short int (2 byte)
  ****************************************************************************/
  
 -int Field_short::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_short::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                 bool *truncated)
++int Field_short::store(const char *from, uint len, CHARSET_INFO *cs,
++                       bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int store_tmp;
@@ -672,17 +655,17 @@
    longlong rnd;
    
 -  error= get_int(cs, from, len, &rnd, UINT_MAX16, INT_MIN16, INT_MAX16);
-+  error= get_int_truncated(cs, from, len, &rnd, UINT_MAX16, INT_MIN16,
-+                           INT_MAX16, truncated);
++  error= get_int(cs, from, len, &rnd, UINT_MAX16, INT_MIN16, INT_MAX16,
++                 truncated);
    store_tmp= unsigned_flag ? (int) (ulonglong) rnd : (int) rnd;
  #ifdef WORDS_BIGENDIAN
    if (table->s->db_low_byte_first)
-@@ -3219,8 +3420,12 @@
+@@ -3219,8 +3411,12 @@
  }
  
  
 -int Field_short::store(double nr)
-+int Field_short::store_truncated(double nr, bool *truncated)
++int Field_short::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -691,7 +674,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    int16 res;
-@@ -3230,12 +3435,20 @@
+@@ -3230,12 +3426,20 @@
      if (nr < 0)
      {
        res=0;
@@ -712,7 +695,7 @@
        set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
        error= 1;
      }
-@@ -3247,12 +3460,20 @@
+@@ -3247,12 +3451,20 @@
      if (nr < (double) INT_MIN16)
      {
        res=INT_MIN16;
@@ -733,12 +716,12 @@
        set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
        error= 1;
      }
-@@ -3271,8 +3492,12 @@
+@@ -3271,8 +3483,12 @@
  }
  
  
 -int Field_short::store(longlong nr, bool unsigned_val)
-+int Field_short::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_short::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -747,7 +730,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    int16 res;
-@@ -3282,13 +3507,11 @@
+@@ -3282,13 +3498,11 @@
      if (nr < 0L && !unsigned_val)
      {
        res=0;
@@ -761,7 +744,7 @@
        error= 1;
      }
      else
-@@ -3302,13 +3525,11 @@
+@@ -3302,13 +3516,11 @@
      if (nr < INT_MIN16)
      {
        res=INT_MIN16;
@@ -775,28 +758,28 @@
        error= 1;
      }
      else
-@@ -3322,6 +3543,14 @@
+@@ -3322,6 +3534,14 @@
    else
  #endif
      shortstore(ptr,res);
 +  if (1 == error)
 +  {
-+    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 +    if (truncated)
 +    {
 +      *truncated= true;
 +    }
++    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 +  }
    return error;
  }
  
-@@ -3445,22 +3674,27 @@
+@@ -3445,22 +3665,28 @@
    Field type medium int (3 byte)
  ****************************************************************************/
  
 -int Field_medium::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_medium::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                  bool *truncated)
++int Field_medium::store(const char *from, uint len, CHARSET_INFO *cs,
++                        bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int store_tmp;
@@ -804,7 +787,8 @@
    longlong rnd;
    
 -  error= get_int(cs, from, len, &rnd, UINT_MAX24, INT_MIN24, INT_MAX24);
-+  error= get_int_truncated(cs, from, len, &rnd, UINT_MAX24, INT_MIN24, INT_MAX24, truncated);
++  error= get_int(cs, from, len, &rnd, UINT_MAX24, INT_MIN24, INT_MAX24,
++                 truncated);
    store_tmp= unsigned_flag ? (int) (ulonglong) rnd : (int) rnd;
    int3store(ptr, store_tmp);
    return error;
@@ -812,7 +796,7 @@
  
  
 -int Field_medium::store(double nr)
-+int Field_medium::store_truncated(double nr, bool *truncated)
++int Field_medium::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -821,7 +805,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    nr=rint(nr);
-@@ -3469,14 +3703,12 @@
+@@ -3469,14 +3695,12 @@
      if (nr < 0)
      {
        int3store(ptr,0);
@@ -836,7 +820,7 @@
        error= 1;
      }
      else
-@@ -3488,25 +3720,35 @@
+@@ -3488,25 +3712,35 @@
      {
        long tmp=(long) INT_MIN24;
        int3store(ptr,tmp);
@@ -866,7 +850,7 @@
  
  
 -int Field_medium::store(longlong nr, bool unsigned_val)
-+int Field_medium::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_medium::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -875,7 +859,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
  
-@@ -3515,14 +3757,12 @@
+@@ -3515,14 +3749,12 @@
      if (nr < 0 && !unsigned_val)
      {
        int3store(ptr,0);
@@ -890,7 +874,7 @@
        error= 1;
      }
      else
-@@ -3537,19 +3777,25 @@
+@@ -3537,19 +3769,25 @@
      {
        long tmp= (long) INT_MIN24;
        int3store(ptr,tmp);
@@ -909,22 +893,22 @@
    }
 +  if (1 == error)
 +  {
-+    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 +    if (truncated)
 +    {
 +      *truncated= true;
 +    }
++    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 +  }
    return error;
  }
  
-@@ -3635,14 +3881,16 @@
+@@ -3635,14 +3873,16 @@
  ** long int
  ****************************************************************************/
  
 -int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_long::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                bool *truncated)
++int Field_long::store(const char *from, uint len, CHARSET_INFO *cs,
++                      bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    long store_tmp;
@@ -932,17 +916,17 @@
    longlong rnd;
    
 -  error= get_int(cs, from, len, &rnd, UINT_MAX32, INT_MIN32, INT_MAX32);
-+  error= get_int_truncated(cs, from, len, &rnd, UINT_MAX32, INT_MIN32,
-+                           INT_MAX32, truncated);
++  error= get_int(cs, from, len, &rnd, UINT_MAX32, INT_MIN32, INT_MAX32,
++                 truncated);
    store_tmp= unsigned_flag ? (long) (ulonglong) rnd : (long) rnd;
  #ifdef WORDS_BIGENDIAN
    if (table->s->db_low_byte_first)
-@@ -3656,8 +3904,12 @@
+@@ -3656,8 +3896,12 @@
  }
  
  
 -int Field_long::store(double nr)
-+int Field_long::store_truncated(double nr, bool *truncated)
++int Field_long::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -951,7 +935,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    int32 res;
-@@ -3672,7 +3924,6 @@
+@@ -3672,7 +3916,6 @@
      else if (nr > (double) UINT_MAX32)
      {
        res= UINT_MAX32;
@@ -959,7 +943,7 @@
        error= 1;
      }
      else
-@@ -3693,8 +3944,14 @@
+@@ -3693,8 +3936,14 @@
      else
        res=(int32) (longlong) nr;
    }
@@ -975,12 +959,12 @@
  
  #ifdef WORDS_BIGENDIAN
    if (table->s->db_low_byte_first)
-@@ -3708,8 +3965,12 @@
+@@ -3708,8 +3957,12 @@
  }
  
  
 -int Field_long::store(longlong nr, bool unsigned_val)
-+int Field_long::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_long::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -989,7 +973,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    int32 res;
-@@ -3746,8 +4007,14 @@
+@@ -3746,8 +3999,14 @@
      else
        res=(int32) nr;
    }
@@ -1005,13 +989,13 @@
  
  #ifdef WORDS_BIGENDIAN
    if (table->s->db_low_byte_first)
-@@ -3882,8 +4149,13 @@
+@@ -3882,8 +4141,13 @@
   Field type longlong int (8 bytes)
  ****************************************************************************/
  
 -int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_longlong::store_truncated(const char *from, uint len,
-+                                    CHARSET_INFO *cs, bool *truncated)
++int Field_longlong::store(const char *from, uint len, CHARSET_INFO *cs,
++                          bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1020,7 +1004,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    char *end;
-@@ -3892,11 +4164,15 @@
+@@ -3892,11 +4156,15 @@
    tmp= cs->cset->strntoull10rnd(cs,from,len,unsigned_flag,&end,&error);
    if (error == MY_ERRNO_ERANGE)
    {
@@ -1031,18 +1015,19 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
      error= 1;
    }
-   else if (table->in_use->count_cuted_fields && 
+-  else if (table->in_use->count_cuted_fields && 
 -           check_int(cs, from, len, end, error))
-+           check_int_truncated(cs, from, len, end, error, truncated))
++  else if (table->in_use->count_cuted_fields &&
++           check_int(cs, from, len, end, error, truncated))
      error= 1;
    else
      error= 0;
-@@ -3912,8 +4188,12 @@
+@@ -3912,8 +4180,12 @@
  }
  
  
 -int Field_longlong::store(double nr)
-+int Field_longlong::store_truncated(double nr, bool *truncated)
++int Field_longlong::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1051,7 +1036,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    longlong res;
-@@ -3950,7 +4230,13 @@
+@@ -3950,7 +4222,13 @@
        res=(longlong) nr;
    }
    if (error)
@@ -1065,12 +1050,12 @@
  
  #ifdef WORDS_BIGENDIAN
    if (table->s->db_low_byte_first)
-@@ -3964,8 +4250,12 @@
+@@ -3964,8 +4242,12 @@
  }
  
  
 -int Field_longlong::store(longlong nr, bool unsigned_val)
-+int Field_longlong::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_longlong::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1079,24 +1064,24 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
  
-@@ -3979,6 +4269,10 @@
+@@ -3978,6 +4260,10 @@
+     if (unsigned_flag != unsigned_val)
      {
        nr= unsigned_flag ? (ulonglong) 0 : (ulonglong) LONGLONG_MAX;
-       set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 +      if (truncated)
 +      {
 +        *truncated= true;
 +      }
+       set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
        error= 1;
      }
-   }
-@@ -4173,27 +4467,41 @@
+@@ -4173,27 +4459,41 @@
    single precision float
  ****************************************************************************/
  
 -int Field_float::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_float::store_truncated(const char *from, uint len, CHARSET_INFO* cs,
-+                                 bool *truncated)
++int Field_float::store(const char *from, uint len, CHARSET_INFO* cs,
++                       bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1118,7 +1103,7 @@
    }
 -  Field_float::store(nr);
 +  bool truncated2= false;
-+  Field_float::store_truncated(nr, &truncated2);
++  Field_float::store(nr, &truncated2);
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -1128,37 +1113,34 @@
  
  
 -int Field_float::store(double nr)
-+int Field_float::store_truncated(double nr, bool *truncated)
++int Field_float::store(double nr, bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
 -  int error= truncate(&nr, FLT_MAX);
-+  int error= truncate_truncated(&nr, FLT_MAX, truncated);
++  int error= truncate(&nr, FLT_MAX, truncated);
    float j= (float)nr;
  
  #ifdef WORDS_BIGENDIAN
-@@ -4208,10 +4516,12 @@
+@@ -4208,10 +4508,10 @@
  }
  
  
 -int Field_float::store(longlong nr, bool unsigned_val)
-+int Field_float::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_float::store(longlong nr, bool unsigned_val, bool *truncated)
  {
--  return Field_float::store(unsigned_val ? ulonglong2double((ulonglong) nr) :
+   return Field_float::store(unsigned_val ? ulonglong2double((ulonglong) nr) :
 -                            (double) nr);
-+  return Field_float::store_truncated(unsigned_val ?
-+                                      ulonglong2double((ulonglong) nr) :
-+                                      (double) nr,
-+                                      truncated);
++                            (double) nr, truncated);
  }
  
  
-@@ -4435,27 +4745,41 @@
+@@ -4435,27 +4735,41 @@
    double precision floating point numbers
  ****************************************************************************/
  
 -int Field_double::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_double::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                  bool *truncated)
++int Field_double::store(const char *from, uint len, CHARSET_INFO *cs,
++                        bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1180,7 +1162,7 @@
    }
 -  Field_double::store(nr);
 +  bool truncated2= false;
-+  Field_double::store_truncated(nr, &truncated2);
++  Field_double::store(nr, &truncated2);
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -1190,37 +1172,33 @@
  
  
 -int Field_double::store(double nr)
-+int Field_double::store_truncated(double nr, bool *truncated)
++int Field_double::store(double nr, bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
 -  int error= truncate(&nr, DBL_MAX);
-+  int error= truncate_truncated(&nr, DBL_MAX, truncated);
++  int error= truncate(&nr, DBL_MAX, truncated);
  
  #ifdef WORDS_BIGENDIAN
    if (table->s->db_low_byte_first)
-@@ -4469,10 +4793,12 @@
+@@ -4469,10 +4783,10 @@
  }
  
  
 -int Field_double::store(longlong nr, bool unsigned_val)
-+int Field_double::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_double::store(longlong nr, bool unsigned_val, bool *truncated)
  {
--  return Field_double::store(unsigned_val ? ulonglong2double((ulonglong) nr) :
+   return Field_double::store(unsigned_val ? ulonglong2double((ulonglong) nr) :
 -                             (double) nr);
-+  return Field_double::store_truncated(unsigned_val ?
-+                                       ulonglong2double((ulonglong) nr) :
-+                                       (double) nr,
-+                                       truncated);
++                             (double) nr, truncated);
  }
  
  /*
-@@ -4481,8 +4807,13 @@
+@@ -4481,8 +4795,12 @@
    Also ensure that the argument is within [-max_value; max_value] range.
  */
  
 -int Field_real::truncate(double *nr, double max_value)
-+int Field_real::truncate_truncated(double *nr, double max_value,
-+                                   bool *truncated)
++int Field_real::truncate(double *nr, double max_value, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1229,7 +1207,7 @@
    int error= 1;
    double res= *nr;
    
-@@ -4490,12 +4820,20 @@
+@@ -4490,12 +4808,20 @@
    {
      res= 0;
      set_null();
@@ -1250,18 +1228,15 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
      goto end;
    }
-@@ -4516,12 +4854,20 @@
-   
+@@ -4517,11 +4843,19 @@
    if (res < -max_value)
    {
--   res= -max_value;
--   set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
-+    res= -max_value;
+    res= -max_value;
 +    if (truncated)
 +    {
 +      *truncated= true;
 +    }
-+    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
+    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
    }
    else if (res > max_value)
    {
@@ -1273,27 +1248,27 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
    }
    else
-@@ -4533,11 +4879,11 @@
+@@ -4533,11 +4867,11 @@
  }
  
  
 -int Field_real::store_decimal(const my_decimal *dm)
-+int Field_real::store_decimal_truncated(const my_decimal *dm, bool *truncated)
++int Field_real::store_decimal(const my_decimal *dm, bool *truncated)
  {
    double dbl;
    my_decimal2double(E_DEC_FATAL_ERROR, dm, &dbl);
 -  return store(dbl);
-+  return store_truncated(dbl, truncated);
++  return store(dbl, truncated);
  }
  
  double Field_double::val_real(void)
-@@ -4879,8 +5225,13 @@
+@@ -4879,8 +5213,13 @@
  }
  
  
 -int Field_timestamp::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_timestamp::store_truncated(const char *from, uint len,
-+                                     CHARSET_INFO *cs, bool *truncated)
++int Field_timestamp::store(const char *from, uint len, CHARSET_INFO *cs,
++                           bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1302,7 +1277,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    MYSQL_TIME l_time;
    my_time_t tmp= 0;
-@@ -4899,6 +5250,10 @@
+@@ -4899,6 +5238,10 @@
    if (error || !have_smth_to_conv)
    {
      error= 1;
@@ -1313,7 +1288,7 @@
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
                           from, len, MYSQL_TIMESTAMP_DATETIME, 1);
    }
-@@ -4908,6 +5263,10 @@
+@@ -4908,6 +5251,10 @@
    {
      if (!(tmp= TIME_to_timestamp(thd, &l_time, &in_dst_time_gap)))
      {
@@ -1324,12 +1299,12 @@
        set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
                             ER_WARN_DATA_OUT_OF_RANGE,
                             from, len, MYSQL_TIMESTAMP_DATETIME, !error);
-@@ -4926,24 +5285,41 @@
+@@ -4926,24 +5273,41 @@
  }
  
  
 -int Field_timestamp::store(double nr)
-+int Field_timestamp::store_truncated(double nr, bool *truncated)
++int Field_timestamp::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1350,7 +1325,7 @@
    }
 -  error|= Field_timestamp::store((longlong) rint(nr), FALSE);
 +  bool truncated2= false;
-+  error|= Field_timestamp::store_truncated((longlong) rint(nr), FALSE, &truncated2);
++  error|= Field_timestamp::store((longlong) rint(nr), FALSE, &truncated2);
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -1360,7 +1335,7 @@
  
  
 -int Field_timestamp::store(longlong nr, bool unsigned_val)
-+int Field_timestamp::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_timestamp::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1369,7 +1344,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    MYSQL_TIME l_time;
    my_time_t timestamp= 0;
-@@ -4964,6 +5340,10 @@
+@@ -4964,6 +5328,10 @@
    {
      if (!(timestamp= TIME_to_timestamp(thd, &l_time, &in_dst_time_gap)))
      {
@@ -1380,7 +1355,7 @@
        set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
                             ER_WARN_DATA_OUT_OF_RANGE,
                             nr, MYSQL_TIMESTAMP_DATETIME, 1);
-@@ -4977,9 +5357,15 @@
+@@ -4977,9 +5345,15 @@
        error= 1;
      }
    } else if (error)
@@ -1396,13 +1371,13 @@
  
    store_timestamp(timestamp);
    return error;
-@@ -5189,8 +5575,13 @@
+@@ -5189,8 +5563,13 @@
  ** Stored as a 3 byte unsigned int
  ****************************************************************************/
  
 -int Field_time::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_time::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                bool *truncated)
++int Field_time::store(const char *from, uint len, CHARSET_INFO *cs,
++                      bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1411,7 +1386,7 @@
    MYSQL_TIME ltime;
    long tmp;
    int error= 0;
-@@ -5200,6 +5591,10 @@
+@@ -5200,6 +5579,10 @@
    {
      tmp=0L;
      error= 2;
@@ -1422,7 +1397,7 @@
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
                           from, len, MYSQL_TIMESTAMP_TIME, 1);
    }
-@@ -5207,6 +5602,10 @@
+@@ -5207,6 +5590,10 @@
    {
      if (warning & MYSQL_TIME_WARN_TRUNCATED)
      {
@@ -1433,7 +1408,7 @@
        set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
                             WARN_DATA_TRUNCATED,
                             from, len, MYSQL_TIMESTAMP_TIME, 1);
-@@ -5214,6 +5613,10 @@
+@@ -5214,6 +5601,10 @@
      }
      if (warning & MYSQL_TIME_WARN_OUT_OF_RANGE)
      {
@@ -1444,12 +1419,12 @@
        set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, 
                             ER_WARN_DATA_OUT_OF_RANGE,
                             from, len, MYSQL_TIMESTAMP_TIME, !error);
-@@ -5241,14 +5644,22 @@
+@@ -5241,14 +5632,22 @@
  }
  
  
 -int Field_time::store(double nr)
-+int Field_time::store_truncated(double nr, bool *truncated)
++int Field_time::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1468,7 +1443,7 @@
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
                           ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_TIME);
      error= 1;
-@@ -5256,6 +5667,10 @@
+@@ -5256,6 +5655,10 @@
    else if (nr < (double)-TIME_MAX_VALUE)
    {
      tmp= -TIME_MAX_VALUE;
@@ -1479,7 +1454,7 @@
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, 
                           ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_TIME);
      error= 1;
-@@ -5268,6 +5683,10 @@
+@@ -5268,6 +5671,10 @@
      if (tmp % 100 > 59 || tmp/100 % 100 > 59)
      {
        tmp=0;
@@ -1490,12 +1465,12 @@
        set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, 
                             ER_WARN_DATA_OUT_OF_RANGE, nr,
                             MYSQL_TIMESTAMP_TIME);
-@@ -5279,14 +5698,22 @@
+@@ -5279,14 +5686,22 @@
  }
  
  
 -int Field_time::store(longlong nr, bool unsigned_val)
-+int Field_time::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_time::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1514,7 +1489,7 @@
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, 
                           ER_WARN_DATA_OUT_OF_RANGE, nr,
                           MYSQL_TIMESTAMP_TIME, 1);
-@@ -5295,6 +5722,10 @@
+@@ -5295,6 +5710,10 @@
    else if (nr > (longlong) TIME_MAX_VALUE || (nr < 0 && unsigned_val))
    {
      tmp= TIME_MAX_VALUE;
@@ -1525,7 +1500,7 @@
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, 
                           ER_WARN_DATA_OUT_OF_RANGE, nr,
                           MYSQL_TIMESTAMP_TIME, 1);
-@@ -5306,6 +5737,10 @@
+@@ -5306,6 +5725,10 @@
      if (tmp % 100 > 59 || tmp/100 % 100 > 59)
      {
        tmp=0;
@@ -1536,13 +1511,13 @@
        set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, 
                             ER_WARN_DATA_OUT_OF_RANGE, nr,
                             MYSQL_TIMESTAMP_TIME, 1);
-@@ -5437,8 +5872,13 @@
+@@ -5437,8 +5860,13 @@
  ** Can handle 2 byte or 4 byte years!
  ****************************************************************************/
  
 -int Field_year::store(const char *from, uint len,CHARSET_INFO *cs)
-+int Field_year::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                bool *truncated)
++int Field_year::store(const char *from, uint len, CHARSET_INFO *cs,
++                      bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1551,7 +1526,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    char *end;
    int error;
-@@ -5448,6 +5888,10 @@
+@@ -5448,6 +5876,10 @@
        error == MY_ERRNO_ERANGE)
    {
      *ptr=0;
@@ -1562,26 +1537,26 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
      return 1;
    }
-@@ -5474,23 +5918,31 @@
+@@ -5474,23 +5906,31 @@
  }
  
  
 -int Field_year::store(double nr)
-+int Field_year::store_truncated(double nr, bool *truncated)
++int Field_year::store(double nr, bool *truncated)
  {
    if (nr < 0.0 || nr >= 2155.0)
    {
 -    (void) Field_year::store((longlong) -1, FALSE);
-+    (void) Field_year::store_truncated((longlong) -1, FALSE, truncated);
++    (void) Field_year::store((longlong) -1, FALSE, truncated);
      return 1;
    }
 -  return Field_year::store((longlong) nr, FALSE);
-+  return Field_year::store_truncated((longlong) nr, FALSE, truncated);
++  return Field_year::store((longlong) nr, FALSE, truncated);
  }
  
  
 -int Field_year::store(longlong nr, bool unsigned_val)
-+int Field_year::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_year::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1598,13 +1573,13 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
      return 1;
    }
-@@ -5560,8 +6012,13 @@
+@@ -5560,8 +6000,13 @@
  ** Stored as a 4 byte unsigned int
  ****************************************************************************/
  
 -int Field_date::store(const char *from, uint len,CHARSET_INFO *cs)
-+int Field_date::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                bool *truncated)
++int Field_date::store(const char *from, uint len, CHARSET_INFO *cs,
++                      bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1613,7 +1588,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    MYSQL_TIME l_time;
    uint32 tmp;
-@@ -5581,8 +6038,14 @@
+@@ -5581,8 +6026,14 @@
      tmp=(uint32) l_time.year*10000L + (uint32) (l_time.month*100+l_time.day);
  
    if (error)
@@ -1628,12 +1603,12 @@
  
  #ifdef WORDS_BIGENDIAN
    if (table && table->s->db_low_byte_first)
-@@ -5596,14 +6059,22 @@
+@@ -5596,14 +6047,22 @@
  }
  
  
 -int Field_date::store(double nr)
-+int Field_date::store_truncated(double nr, bool *truncated)
++int Field_date::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1652,13 +1627,13 @@
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
                           ER_WARN_DATA_OUT_OF_RANGE,
                           nr, MYSQL_TIMESTAMP_DATE);
-@@ -5611,12 +6082,22 @@
+@@ -5611,12 +6070,22 @@
    else
      tmp= (longlong) rint(nr);
  
 -  return Field_date::store(tmp, TRUE);
 +  bool truncated2= false;
-+  int result= Field_date::store_truncated(tmp, TRUE, &truncated2);
++  int result= Field_date::store(tmp, TRUE, &truncated2);
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -1668,7 +1643,7 @@
  
  
 -int Field_date::store(longlong nr, bool unsigned_val)
-+int Field_date::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_date::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1677,7 +1652,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    MYSQL_TIME not_used;
    int error;
-@@ -5639,10 +6120,16 @@
+@@ -5639,10 +6108,16 @@
      nr= (longlong) floor(nr/1000000.0);         // Timestamp to date
  
    if (error)
@@ -1694,13 +1669,13 @@
  
  #ifdef WORDS_BIGENDIAN
    if (table && table->s->db_low_byte_first)
-@@ -5794,8 +6281,13 @@
+@@ -5794,8 +6269,13 @@
         store function.
  */
  
 -int Field_newdate::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_newdate::store_truncated(const char *from, uint len, CHARSET_INFO *cs,
-+                                   bool *truncated)
++int Field_newdate::store(const char *from, uint len, CHARSET_INFO *cs,
++                         bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1709,7 +1684,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    long tmp;
    MYSQL_TIME l_time;
-@@ -5821,31 +6313,45 @@
+@@ -5821,31 +6301,45 @@
    }
  
    if (error)
@@ -1730,7 +1705,7 @@
  
  
 -int Field_newdate::store(double nr)
-+int Field_newdate::store_truncated(double nr, bool *truncated)
++int Field_newdate::store(double nr, bool *truncated)
  {
    if (nr < 0.0 || nr > 99991231235959.0)
    {
@@ -1744,12 +1719,12 @@
      return 1;
    }
 -  return Field_newdate::store((longlong) rint(nr), FALSE);
-+  return Field_newdate::store_truncated((longlong) rint(nr), FALSE, truncated);
++  return Field_newdate::store((longlong) rint(nr), FALSE, truncated);
  }
  
  
 -int Field_newdate::store(longlong nr, bool unsigned_val)
-+int Field_newdate::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_newdate::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1758,7 +1733,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    MYSQL_TIME l_time;
    longlong tmp;
-@@ -5869,11 +6375,17 @@
+@@ -5869,11 +6363,17 @@
      error= 3;
  
    if (error)
@@ -1776,13 +1751,13 @@
  
    int3store(ptr,tmp);
    return error;
-@@ -6027,8 +6539,13 @@
+@@ -6027,8 +6527,13 @@
  ** Stored as a 8 byte unsigned int. Should sometimes be change to a 6 byte int.
  ****************************************************************************/
  
 -int Field_datetime::store(const char *from,uint len,CHARSET_INFO *cs)
-+int Field_datetime::store_truncated(const char *from, uint len,
-+                                    CHARSET_INFO *cs, bool *truncated)
++int Field_datetime::store(const char *from, uint len, CHARSET_INFO *cs,
++                          bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1791,7 +1766,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    MYSQL_TIME time_tmp;
    int error;
-@@ -6048,9 +6565,15 @@
+@@ -6048,9 +6553,15 @@
      error= 1;                                 // Fix if invalid zero date
  
    if (error)
@@ -1807,12 +1782,12 @@
  
  #ifdef WORDS_BIGENDIAN
    if (table && table->s->db_low_byte_first)
-@@ -6064,24 +6587,43 @@
+@@ -6064,24 +6575,41 @@
  }
  
  
 -int Field_datetime::store(double nr)
-+int Field_datetime::store_truncated(double nr, bool *truncated)
++int Field_datetime::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1833,8 +1808,7 @@
    }
 -  error|= Field_datetime::store((longlong) rint(nr), FALSE);
 +  bool truncated2= false;
-+  error|= Field_datetime::store_truncated((longlong) rint(nr), FALSE,
-+                                          &truncated2);
++  error|= Field_datetime::store((longlong) rint(nr), FALSE, &truncated2);
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -1844,8 +1818,7 @@
  
  
 -int Field_datetime::store(longlong nr, bool unsigned_val)
-+int Field_datetime::store_truncated(longlong nr, bool unsigned_val,
-+                                    bool *truncated)
++int Field_datetime::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1854,7 +1827,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    MYSQL_TIME not_used;
    int error;
-@@ -6101,10 +6641,16 @@
+@@ -6101,10 +6629,16 @@
    }
  
    if (error)
@@ -1871,13 +1844,13 @@
  
  #ifdef WORDS_BIGENDIAN
    if (table && table->s->db_low_byte_first)
-@@ -6421,8 +6967,13 @@
+@@ -6421,8 +6955,13 @@
  
  	/* Copy a string and fill with space */
  
 -int Field_string::store(const char *from,uint length,CHARSET_INFO *cs)
-+int Field_string::store_truncated(const char *from, uint length, CHARSET_INFO *cs,
-+                                  bool *truncated)
++int Field_string::store(const char *from, uint length, CHARSET_INFO *cs,
++                        bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1886,7 +1859,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    uint copy_length;
    const char *well_formed_error_pos;
-@@ -6439,6 +6990,10 @@
+@@ -6439,6 +6978,10 @@
                                         &well_formed_error_pos,
                                         &cannot_convert_error_pos,
                                         &from_end_pos);
@@ -1897,30 +1870,30 @@
  
    /* Append spaces if the string was shorter than the field. */
    if (copy_length < field_length)
-@@ -6462,7 +7017,7 @@
+@@ -6462,7 +7005,7 @@
    @param nr            number
  */
  
 -int Field_str::store(double nr)
-+int Field_str::store_truncated(double nr, bool *truncated)
++int Field_str::store(double nr, bool *truncated)
  {
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    char buff[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE];
-@@ -6544,7 +7099,7 @@
+@@ -6544,7 +7087,7 @@
      like inserting 500.0 in char(1)
    */
    DBUG_ASSERT(local_char_length < 5 || length <= local_char_length+1);
 -  return store(buff, length, charset());
-+  return store_truncated(buff, length, charset(), truncated);
++  return store(buff, length, charset(), truncated);
  }
  
  
-@@ -6565,23 +7120,37 @@
+@@ -6565,23 +7108,38 @@
  }
  
  
 -int Field_string::store(longlong nr, bool unsigned_val)
-+int Field_string::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_string::store(longlong nr, bool unsigned_val, bool *truncated)
  {
    char buff[64];
    int  l;
@@ -1928,12 +1901,12 @@
    l= (cs->cset->longlong10_to_str)(cs,buff,sizeof(buff),
                                     unsigned_val ? 10 : -10, nr);
 -  return Field_string::store(buff,(uint)l,cs);
-+  return Field_string::store_truncated(buff,(uint)l,cs, truncated);
++  return Field_string::store(buff,(uint)l,cs, truncated);
  }
  
  
 -int Field_longstr::store_decimal(const my_decimal *d)
-+int Field_longstr::store_decimal_truncated(const my_decimal *d, bool *truncated)
++int Field_longstr::store_decimal(const my_decimal *d, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1944,12 +1917,13 @@
 -  my_decimal2string(E_DEC_FATAL_ERROR, d, 0, 0, 0, &str);
 -  return store(str.ptr(), str.length(), str.charset());
 +  int op_result= my_decimal2string(E_DEC_FATAL_ERROR, d, 0, 0, 0, &str);
-+  if (truncated && (E_DEC_OVERFLOW == op_result || E_DEC_TRUNCATED == op_result))
++  if (truncated && (E_DEC_OVERFLOW == op_result ||
++                    E_DEC_TRUNCATED == op_result))
 +  {
 +    *truncated= true;
 +  }
 +  bool truncated2= false;
-+  int result= store_truncated(str.ptr(), str.length(), str.charset(), &truncated2);
++  int result= store(str.ptr(), str.length(), str.charset(), &truncated2);
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -1958,13 +1932,13 @@
  }
  
  uint32 Field_longstr::max_data_length() const
-@@ -7096,8 +7665,13 @@
+@@ -7095,8 +7653,13 @@
    return 2;
  }
  
 -int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)
-+int Field_varstring::store_truncated(const char *from, uint length,
-+                                     CHARSET_INFO *cs, bool *truncated)
++int Field_varstring::store(const char *from, uint length, CHARSET_INFO *cs,
++                           bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -1973,7 +1947,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    uint copy_length;
    const char *well_formed_error_pos;
-@@ -7112,6 +7686,10 @@
+@@ -7111,6 +7674,10 @@
                                         &well_formed_error_pos,
                                         &cannot_convert_error_pos,
                                         &from_end_pos);
@@ -1984,31 +1958,31 @@
  
    if (length_bytes == 1)
      *ptr= (uchar) copy_length;
-@@ -7126,7 +7704,7 @@
+@@ -7125,7 +7692,7 @@
  }
  
  
 -int Field_varstring::store(longlong nr, bool unsigned_val)
-+int Field_varstring::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_varstring::store(longlong nr, bool unsigned_val, bool *truncated)
  {
    char buff[64];
    uint  length;
-@@ -7136,7 +7714,7 @@
+@@ -7135,7 +7702,7 @@
                                                            (unsigned_val ? 10:
                                                             -10),
                                                             nr);
 -  return Field_varstring::store(buff, length, field_charset);
-+  return Field_varstring::store_truncated(buff, length, field_charset, truncated);
++  return Field_varstring::store(buff, length, field_charset, truncated);
  }
  
  
-@@ -7761,10 +8339,16 @@
+@@ -7760,10 +8327,16 @@
  }
  
  
 -int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs)
-+int Field_blob::store_truncated(const char *from, uint length, CHARSET_INFO *cs,
-+                                bool *truncated)
++int Field_blob::store(const char *from, uint length, CHARSET_INFO *cs,
++                      bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2020,7 +1994,7 @@
    const char *well_formed_error_pos;
    const char *cannot_convert_error_pos;
    const char *from_end_pos, *tmp;
-@@ -7801,7 +8385,11 @@
+@@ -7800,7 +8373,11 @@
      from= tmpstr.ptr();
    }
  
@@ -2033,7 +2007,7 @@
    if (value.alloc(new_length))
      goto oom_error;
  
-@@ -7828,6 +8416,10 @@
+@@ -7827,6 +8404,10 @@
                                         &well_formed_error_pos,
                                         &cannot_convert_error_pos,
                                         &from_end_pos);
@@ -2044,38 +2018,36 @@
  
    Field_blob::store_length(copy_length);
    tmp= value.ptr();
-@@ -7846,19 +8438,21 @@
+@@ -7845,19 +8426,19 @@
  }
  
  
 -int Field_blob::store(double nr)
-+int Field_blob::store_truncated(double nr, bool *truncated)
++int Field_blob::store(double nr, bool *truncated)
  {
    CHARSET_INFO *cs=charset();
    value.set_real(nr, 2, cs);
 -  return Field_blob::store(value.ptr(),(uint) value.length(), cs);
-+  return Field_blob::store_truncated(value.ptr(), (uint) value.length(), cs,
-+                                     truncated);
++  return Field_blob::store(value.ptr(), (uint) value.length(), cs, truncated);
  }
  
  
 -int Field_blob::store(longlong nr, bool unsigned_val)
-+int Field_blob::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_blob::store(longlong nr, bool unsigned_val, bool *truncated)
  {
    CHARSET_INFO *cs=charset();
    value.set_int(nr, unsigned_val, cs);
 -  return Field_blob::store(value.ptr(), (uint) value.length(), cs);
-+  return Field_blob::store_truncated(value.ptr(), (uint) value.length(), cs,
-+                                     truncated);
++  return Field_blob::store(value.ptr(), (uint) value.length(), cs, truncated);
  }
  
  
-@@ -8404,32 +8996,49 @@
+@@ -8403,32 +8984,49 @@
  }
  
  
 -int Field_geom::store(double nr)
-+int Field_geom::store_truncated(double nr, bool *truncated)
++int Field_geom::store(double nr, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2088,7 +2060,7 @@
  
  
 -int Field_geom::store(longlong nr, bool unsigned_val)
-+int Field_geom::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_geom::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2101,7 +2073,7 @@
  
  
 -int Field_geom::store_decimal(const my_decimal *)
-+int Field_geom::store_decimal_truncated(const my_decimal*, bool *truncated)
++int Field_geom::store_decimal(const my_decimal*, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2114,8 +2086,8 @@
  
  
 -int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
-+int Field_geom::store_truncated(const char *from, uint length,
-+                                CHARSET_INFO *cs, bool *truncated)
++int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs,
++                      bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2124,13 +2096,13 @@
    if (!length)
      bzero(ptr, Field_blob::pack_length());
    else
-@@ -8524,8 +9133,13 @@
+@@ -8523,8 +9121,13 @@
      (if there isn't a empty value in the enum)
  */
  
 -int Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
-+int Field_enum::store_truncated(const char *from, uint length, CHARSET_INFO *cs,
-+                                bool *truncated)
++int Field_enum::store(const char *from, uint length, CHARSET_INFO *cs,
++                      bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2139,18 +2111,15 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int err= 0;
    uint32 not_used;
-@@ -8553,32 +9167,50 @@
-       tmp=(uint) my_strntoul(cs,from,length,10,&end,&err);
+@@ -8553,31 +9156,49 @@
        if (err || end != from+length || tmp > typelib->count)
        {
--	tmp=0;
--	set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
-+	 tmp=0;
-+	 set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
+ 	tmp=0;
 +        if (truncated)
 +        {
 +          *truncated= true;
 +        }
+ 	set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
        }
        if (!table->in_use->count_cuted_fields)
          err= 0;
@@ -2170,15 +2139,15 @@
  
  
 -int Field_enum::store(double nr)
-+int Field_enum::store_truncated(double nr, bool *truncated)
++int Field_enum::store(double nr, bool *truncated)
  {
 -  return Field_enum::store((longlong) nr, FALSE);
-+  return Field_enum::store_truncated((longlong) nr, FALSE, truncated);
++  return Field_enum::store((longlong) nr, FALSE, truncated);
  }
  
  
 -int Field_enum::store(longlong nr, bool unsigned_val)
-+int Field_enum::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_enum::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2195,13 +2164,13 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
      if (nr != 0 || table->in_use->count_cuted_fields)
      {
-@@ -8742,8 +9374,13 @@
+@@ -8741,8 +9362,13 @@
  */
  
  
 -int Field_set::store(const char *from,uint length,CHARSET_INFO *cs)
-+int Field_set::store_truncated(const char *from, uint length, CHARSET_INFO *cs,
-+                               bool *truncated)
++int Field_set::store(const char *from, uint length, CHARSET_INFO *cs,
++                     bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2210,7 +2179,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    bool got_warning= 0;
    int err= 0;
-@@ -8772,18 +9409,29 @@
+@@ -8771,6 +9397,10 @@
  	tmp > (ulonglong) (((longlong) 1 << typelib->count) - (longlong) 1))
      {
        tmp=0;      
@@ -2221,20 +2190,12 @@
        set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
      }
    }
--  else if (got_warning)
--    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
-+  else 
-+  {
-+    if (got_warning)
-+      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
-+  }
-   store_type(tmp);
-   return err;
+@@ -8781,8 +9411,12 @@
  }
  
  
 -int Field_set::store(longlong nr, bool unsigned_val)
-+int Field_set::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_set::store(longlong nr, bool unsigned_val, bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2243,7 +2204,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int error= 0;
    ulonglong max_nr;
-@@ -8796,6 +9444,10 @@
+@@ -8795,6 +9429,10 @@
    if ((ulonglong) nr > max_nr)
    {
      nr&= max_nr;
@@ -2254,13 +2215,13 @@
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
      error=1;
    }
-@@ -9105,8 +9757,13 @@
+@@ -9104,8 +9742,13 @@
  }
  
                         
 -int Field_bit::store(const char *from, uint length, CHARSET_INFO *cs)
-+int Field_bit::store_truncated(const char *from, uint length, CHARSET_INFO *cs,
-+                               bool *truncated)
++int Field_bit::store(const char *from, uint length, CHARSET_INFO *cs,
++                     bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2269,7 +2230,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int delta;
  
-@@ -9123,6 +9780,10 @@
+@@ -9122,6 +9765,10 @@
        set_warning(MYSQL_ERROR::WARN_LEVEL_ERROR, ER_DATA_TOO_LONG, 1);
      else
        set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
@@ -2280,38 +2241,38 @@
      return 1;
    }
    /* delta is >= -1 here */
-@@ -9152,26 +9813,32 @@
+@@ -9151,26 +9798,32 @@
  }
  
  
 -int Field_bit::store(double nr)
-+int Field_bit::store_truncated(double nr, bool *truncated)
++int Field_bit::store(double nr, bool *truncated)
  {
 -  return Field_bit::store((longlong) nr, FALSE);
-+  return Field_bit::store_truncated((longlong) nr, FALSE, truncated);
++  return Field_bit::store((longlong) nr, FALSE, truncated);
  }
  
  
 -int Field_bit::store(longlong nr, bool unsigned_val)
-+int Field_bit::store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++int Field_bit::store(longlong nr, bool unsigned_val, bool *truncated)
  {
    char buf[8];
  
    mi_int8store(buf, nr);
 -  return store(buf, 8, NULL);
-+  return store_truncated(buf, 8, NULL, truncated);
++  return store(buf, 8, NULL, truncated);
  }
  
  
 -int Field_bit::store_decimal(const my_decimal *val)
-+int Field_bit::store_decimal_truncated(const my_decimal *val, bool *truncated)
++int Field_bit::store_decimal(const my_decimal *val, bool *truncated)
  {
    int err= 0;
 -  longlong i= convert_decimal2longlong(val, 1, &err);
 -  return test(err | store(i, TRUE));
-+  longlong i= convert_decimal2longlong_truncated(val, 1, &err, truncated);
++  longlong i= convert_decimal2longlong(val, 1, &err, truncated);
 +  bool truncated2= false;
-+  int result= test(err | store_truncated(i, TRUE, &truncated2));
++  int result= test(err | store(i, TRUE, &truncated2));
 +  if (truncated)
 +  {
 +    *truncated= (*truncated) || truncated2;
@@ -2320,13 +2281,13 @@
  }
  
  
-@@ -9561,8 +10228,13 @@
+@@ -9560,8 +10213,13 @@
  }
  
  
 -int Field_bit_as_char::store(const char *from, uint length, CHARSET_INFO *cs)
-+int Field_bit_as_char::store_truncated(const char *from, uint length,
-+                                       CHARSET_INFO *cs, bool *truncated)
++int Field_bit_as_char::store(const char *from, uint length, CHARSET_INFO *cs,
++                             bool *truncated)
  {
 +  if (truncated)
 +  {
@@ -2335,7 +2296,7 @@
    ASSERT_COLUMN_MARKED_FOR_WRITE;
    int delta;
    uchar bits= (uchar) (field_length & 7);
-@@ -9580,6 +10252,10 @@
+@@ -9579,6 +10237,10 @@
        set_warning(MYSQL_ERROR::WARN_LEVEL_ERROR, ER_DATA_TOO_LONG, 1);
      else
        set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
@@ -2391,43 +2352,40 @@
    ulong length=((Field_blob*) copy->from_field)->get_length();
    ((Field_blob*) copy->to_field)->store_length(length);
    memcpy_fixed(copy->to_ptr,copy->from_ptr,sizeof(char*));
-@@ -293,9 +298,10 @@
+@@ -293,9 +298,9 @@
  static void do_conv_blob(Copy_field *copy)
  {
    copy->from_field->val_str(&copy->tmp);
 -  ((Field_blob *) copy->to_field)->store(copy->tmp.ptr(),
-+  ((Field_blob *) copy->to_field)->store_truncated(copy->tmp.ptr(),
- 					 copy->tmp.length(),
+-					 copy->tmp.length(),
 -					 copy->tmp.charset());
-+					 copy->tmp.charset(),
-+                                        &(copy->truncated));
++  ((Field_blob *) copy->to_field)->store(copy->tmp.ptr(), copy->tmp.length(),
++                                         copy->tmp.charset(),
++                                         &(copy->truncated));
  }
  
  /** Save blob in copy->tmp for GROUP BY. */
-@@ -306,9 +312,10 @@
+@@ -306,9 +311,9 @@
    String res(buff,sizeof(buff),copy->tmp.charset());
    copy->from_field->val_str(&res);
    copy->tmp.copy(res);
 -  ((Field_blob *) copy->to_field)->store(copy->tmp.ptr(),
 -					 copy->tmp.length(),
 -					 copy->tmp.charset());
-+  ((Field_blob *) copy->to_field)->store_truncated(copy->tmp.ptr(),
-+                                                   copy->tmp.length(),
-+                                                   copy->tmp.charset(),
-+                                                   &(copy->truncated));
++  ((Field_blob *) copy->to_field)->store(copy->tmp.ptr(), copy->tmp.length(),
++                                         copy->tmp.charset(),
++                                         &(copy->truncated));
  }
  
  
-@@ -317,15 +324,20 @@
+@@ -317,15 +322,18 @@
    char buff[MAX_FIELD_WIDTH];
    copy->tmp.set_quick(buff,sizeof(buff),copy->tmp.charset());
    copy->from_field->val_str(&copy->tmp);
 -  copy->to_field->store(copy->tmp.c_ptr_quick(),copy->tmp.length(),
 -                        copy->tmp.charset());
-+  copy->to_field->store_truncated(copy->tmp.c_ptr_quick(),
-+                                  copy->tmp.length(),
-+                                  copy->tmp.charset(),
-+                                  &(copy->truncated));
++  copy->to_field->store(copy->tmp.c_ptr_quick(), copy->tmp.length(),
++                        copy->tmp.charset(), &(copy->truncated));
  }
  
  
@@ -2441,16 +2399,14 @@
    else
      do_field_string(copy);
  }
-@@ -341,29 +353,33 @@
+@@ -341,29 +349,30 @@
    uint length= my_lengthsp_8bit(&my_charset_bin, copy->tmp.c_ptr_quick(),
                                  copy->from_field->field_length);
  
 -  copy->to_field->store(copy->tmp.c_ptr_quick(), length,
 -                        copy->tmp.charset());
-+  copy->to_field->store_truncated(copy->tmp.c_ptr_quick(),
-+                                  length,
-+                                  copy->tmp.charset(),
-+                                  &(copy->truncated));
++  copy->to_field->store(copy->tmp.c_ptr_quick(), length, copy->tmp.charset(),
++                        &(copy->truncated));
  }
  
  
@@ -2459,8 +2415,7 @@
    longlong value= copy->from_field->val_int();
 -  copy->to_field->store(value,
 -                        test(copy->from_field->flags & UNSIGNED_FLAG));
-+  copy->to_field->store_truncated(value,
-+                        test(copy->from_field->flags & UNSIGNED_FLAG),
++  copy->to_field->store(value, test(copy->from_field->flags & UNSIGNED_FLAG),
 +                        &(copy->truncated));
  }
  
@@ -2468,7 +2423,7 @@
  {
    double value=copy->from_field->val_real();
 -  copy->to_field->store(value);
-+  copy->to_field->store_truncated(value,&(copy->truncated));
++  copy->to_field->store(value,&(copy->truncated));
  }
  
  
@@ -2476,12 +2431,12 @@
  {
    my_decimal value;
 -  copy->to_field->store_decimal(copy->from_field->val_decimal(&value));
-+  copy->to_field->store_decimal_truncated(copy->from_field->val_decimal(&value),
-+                                          &(copy->truncated));
++  copy->to_field->store_decimal(copy->from_field->val_decimal(&value),
++                                &(copy->truncated));
  }
  
  
-@@ -376,13 +392,14 @@
+@@ -376,13 +385,14 @@
  {
    CHARSET_INFO *cs= copy->from_field->charset();
    memcpy(copy->to_ptr,copy->from_ptr,copy->to_length);
@@ -2497,7 +2452,7 @@
      copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
                                  WARN_DATA_TRUNCATED, 1);
    }
-@@ -396,6 +413,7 @@
+@@ -396,6 +406,7 @@
  
  static void do_cut_string_complex(Copy_field *copy)
  {						// Shorter string field
@@ -2505,7 +2460,7 @@
    int well_formed_error;
    CHARSET_INFO *cs= copy->from_field->charset();
    const uchar *from_end= copy->from_ptr + copy->from_length;
-@@ -405,7 +423,10 @@
+@@ -405,7 +416,10 @@
                                                copy->to_length / cs->mbmaxlen,
                                                &well_formed_error);
    if (copy->to_length < copy_length)
@@ -2516,7 +2471,7 @@
    memcpy(copy->to_ptr, copy->from_ptr, copy_length);
  
    /* Check if we lost any important characters */
-@@ -414,6 +435,7 @@
+@@ -414,6 +428,7 @@
                       (char*) from_end,
                       MY_SEQ_SPACES) < (copy->from_length - copy_length))
    {
@@ -2524,7 +2479,7 @@
      copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
                                  WARN_DATA_TRUNCATED, 1);
    }
-@@ -447,13 +469,17 @@
+@@ -447,13 +462,17 @@
  
  static void do_varstring1(Copy_field *copy)
  {
@@ -2542,7 +2497,7 @@
    }
    *(uchar*) copy->to_ptr= (uchar) length;
    memcpy(copy->to_ptr+1, copy->from_ptr + 1, length);
-@@ -462,6 +488,7 @@
+@@ -462,6 +481,7 @@
  
  static void do_varstring1_mb(Copy_field *copy)
  {
@@ -2550,7 +2505,7 @@
    int well_formed_error;
    CHARSET_INFO *cs= copy->from_field->charset();
    uint from_length= (uint) *(uchar*) copy->from_ptr;
-@@ -473,8 +500,11 @@
+@@ -473,8 +493,11 @@
    if (length < from_length)
    {
      if (current_thd->count_cuted_fields)
@@ -2562,7 +2517,7 @@
    }
    *copy->to_ptr= (uchar) length;
    memcpy(copy->to_ptr + 1, from_ptr, length);
-@@ -483,13 +513,17 @@
+@@ -483,13 +506,17 @@
  
  static void do_varstring2(Copy_field *copy)
  {
@@ -2580,7 +2535,7 @@
    }
    int2store(copy->to_ptr,length);
    memcpy(copy->to_ptr+HA_KEY_BLOB_LENGTH, copy->from_ptr + HA_KEY_BLOB_LENGTH,
-@@ -499,6 +533,7 @@
+@@ -499,6 +526,7 @@
  
  static void do_varstring2_mb(Copy_field *copy)
  {
@@ -2588,7 +2543,7 @@
    int well_formed_error;
    CHARSET_INFO *cs= copy->from_field->charset();
    uint char_length= (copy->to_length - HA_KEY_BLOB_LENGTH) / cs->mbmaxlen;
-@@ -509,6 +544,7 @@
+@@ -509,6 +537,7 @@
                                           char_length, &well_formed_error);
    if (length < from_length)
    {
@@ -2598,7 +2553,7 @@
                                    WARN_DATA_TRUNCATED, 1);
 --- a/sql/field.h
 +++ b/sql/field.h
-@@ -115,10 +115,27 @@
+@@ -115,10 +115,11 @@
          const char *field_name_arg);
    virtual ~Field() {}
    /* Store functions returns 1 on overflow and -1 on fatal error */
@@ -2606,78 +2561,48 @@
 -  virtual int  store(double nr)=0;
 -  virtual int  store(longlong nr, bool unsigned_val)=0;
 -  virtual int  store_decimal(const my_decimal *d)=0;
-+  virtual int  store(const char *to, uint length, CHARSET_INFO *cs)
-+  {
-+    return store_truncated(to,length,cs,0);
-+  }
-+  virtual int  store_truncated(const char *to, uint length, CHARSET_INFO *cs,
-+                               bool *truncated)=0;
-+  virtual int  store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  virtual int  store_truncated(double nr, bool *truncated)=0;
-+  virtual int  store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  virtual int  store_truncated(longlong nr, bool unsigned_val, bool *truncated)=0;
-+  virtual int  store_decimal(const my_decimal *d)
-+  {
-+    return store_decimal_truncated(d, 0);
-+  }
-+  virtual int  store_decimal_truncated(const my_decimal *d, bool *truncated)=0;
++  virtual int store(const char *to, uint length, CHARSET_INFO *cs,
++                    bool *truncated= NULL)=0;
++  virtual int store(double nr, bool *truncated= NULL)=0;
++  virtual int store(longlong nr, bool unsigned_val, bool *truncated= NULL)=0;
++  virtual int store_decimal(const my_decimal *d, bool *truncated= NULL)=0;
    virtual int store_time(MYSQL_TIME *ltime, timestamp_type t_type);
    int store(const char *to, uint length, CHARSET_INFO *cs,
              enum_check_fields check_level);
-@@ -463,7 +480,18 @@
+@@ -463,7 +464,13 @@
    {
      return (op_result == E_DEC_OVERFLOW);
    }
 -  int warn_if_overflow(int op_result);
-+  int warn_if_overflow(int op_result)
-+  {
-+    return warn_if_overflow_truncated(op_result, 0);
-+  }
-+  int warn_if_overflow_truncated(int op_result, bool *truncated);
-+  inline void if_overflow_truncated(int op_result, bool *truncated)
-+  {
-+    if (truncated)
-+    {
-+      *truncated= (op_result == E_DEC_OVERFLOW) || (op_result == E_DEC_TRUNCATED);
-+    }
++  int warn_if_overflow(int op_result, bool *truncated= NULL);
++  inline void if_overflow(int op_result, bool *truncated)
++  {
++    if (!truncated)
++      return;
++    *truncated= (op_result == E_DEC_OVERFLOW) || (op_result == E_DEC_TRUNCATED);
 +  }
    void init(TABLE *table_arg)
    {
      orig_table= table= table_arg;
-@@ -484,6 +512,12 @@
+@@ -483,7 +490,7 @@
+   virtual uint is_equal(Create_field *new_field);
    /* convert decimal to longlong with overflow check */
    longlong convert_decimal2longlong(const my_decimal *val, bool unsigned_flag,
 -                                    int *err);
-+                                    int *err)
-+  {
-+    return convert_decimal2longlong_truncated(val, unsigned_flag, err, 0);
-+  }
-+  longlong convert_decimal2longlong_truncated(const my_decimal *val,
-+                                              bool unsigned_flag, int *err,
-+                                              bool *truncated);
++                                    int *err, bool *truncated= NULL);
    /* The max. number of characters */
    inline uint32 char_length() const
    {
-@@ -636,7 +670,11 @@
+@@ -636,7 +643,7 @@
    uint decimals() const { return (uint) dec; }
    uint size_of() const { return sizeof(*this); }
    bool eq_def(Field *field);
 -  int store_decimal(const my_decimal *);
-+  int store_decimal(const my_decimal *value)
-+  {
-+    return store_decimal_truncated(value, 0);
-+  }
-+  int store_decimal_truncated(const my_decimal*, bool *truncated);
++  int store_decimal(const my_decimal*, bool *truncated= NULL);
    uint row_pack_length()
    {
      return pack_length();
-@@ -651,10 +689,22 @@
+@@ -651,10 +658,10 @@
    my_decimal *val_decimal(my_decimal *);
    uint is_equal(Create_field *new_field);
    int check_int(CHARSET_INFO *cs, const char *str, int length,
@@ -2685,26 +2610,14 @@
 -  bool get_int(CHARSET_INFO *cs, const char *from, uint len, 
 -               longlong *rnd, ulonglong unsigned_max, 
 -               longlong signed_min, longlong signed_max);
-+                const char *int_end, int error)
-+  {
-+    return check_int_truncated(cs, str, length, int_end, error, 0);
-+  }
-+  int check_int_truncated(CHARSET_INFO *cs, const char *str, int length,
-+                          const char *int_end, int error, bool *truncated);
++                const char *int_end, int error, bool *truncated= NULL);
 +  bool get_int(CHARSET_INFO *cs, const char *from, uint len, longlong *rnd,
-+               ulonglong unsigned_max, longlong signed_min, longlong signed_max)
-+  {
-+    return get_int_truncated(cs, from,len, rnd, unsigned_max, signed_min,
-+                             signed_max, 0);
-+  }
-+  bool get_int_truncated(CHARSET_INFO *cs, const char *from, uint len,
-+                         longlong *rnd, ulonglong unsigned_max,
-+                         longlong signed_min, longlong signed_max,
-+                         bool *truncated);
++               ulonglong unsigned_max, longlong signed_min, longlong signed_max,
++               bool *truncated= NULL);
  };
  
  
-@@ -668,10 +718,27 @@
+@@ -668,10 +675,10 @@
  	    const char *field_name_arg, CHARSET_INFO *charset);
    Item_result result_type () const { return STRING_RESULT; }
    uint decimals() const { return NOT_FIXED_DEC; }
@@ -2712,324 +2625,177 @@
 -  int  store(longlong nr, bool unsigned_val)=0;
 -  int  store_decimal(const my_decimal *);
 -  int  store(const char *to,uint length,CHARSET_INFO *cs)=0;
-+  int  store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int  store_truncated(double nr, bool *truncated);
-+  int  store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int  store_truncated(longlong nr, bool unsigned_val, bool *truncated)=0;
-+  int  store_decimal(const my_decimal *value)
-+  {
-+    return store_decimal_truncated(value, 0);
-+  }
-+  int  store_decimal_truncated(const my_decimal*, bool *truncated);
-+  int  store(const char *to, uint length, CHARSET_INFO *cs)
-+  {
-+    return store_truncated(to, length, cs, 0);
-+  }
-+  int  store_truncated(const char* to, uint length, CHARSET_INFO *cs,
-+                       bool *truncated)=0;
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL)=0;
++  int store_decimal(const my_decimal *value, bool *truncated= NULL);
++  int store(const char *to, uint length, CHARSET_INFO *cs, bool *truncated= NULL)=0;
    uint size_of() const { return sizeof(*this); }
    CHARSET_INFO *charset(void) const { return field_charset; }
    void set_charset(CHARSET_INFO *charset_arg) { field_charset= charset_arg; }
-@@ -702,7 +769,11 @@
+@@ -702,7 +709,7 @@
                 field_name_arg, charset_arg)
      {}
  
 -  int store_decimal(const my_decimal *d);
-+  int store_decimal(const my_decimal *d)
-+  {
-+    return store_decimal_truncated(d, 0);
-+  }
-+  int store_decimal_truncated(const my_decimal *d, bool *truncated);
++  int store_decimal(const my_decimal *d, bool *truncated= NULL);
    uint32 max_data_length() const;
  };
  
-@@ -719,9 +790,17 @@
+@@ -719,9 +726,9 @@
                 field_name_arg, dec_arg, zero_arg, unsigned_arg),
      not_fixed(dec_arg >= NOT_FIXED_DEC)
      {}
 -  int store_decimal(const my_decimal *);
-+  int store_decimal(const my_decimal *value)
-+  {
-+    return store_decimal_truncated(value, 0);
-+  }
-+  int store_decimal_truncated(const my_decimal*, bool *truncated);
++  int store_decimal(const my_decimal *value, bool *truncated= NULL);
    my_decimal *val_decimal(my_decimal *);
 -  int truncate(double *nr, double max_length);
-+  int truncate(double *nr, double max_length)
-+  {
-+    return truncate_truncated(nr, max_length, 0);
-+  }
-+  int truncate_truncated(double *nr, double max_length, bool *truncated);
++  int truncate(double *nr, double max_length, bool *truncated= NULL);
    uint32 max_display_length() { return field_length; }
    uint size_of() const { return sizeof(*this); }
    virtual const uchar *unpack(uchar* to, const uchar *from,
-@@ -745,9 +824,22 @@
+@@ -745,9 +752,10 @@
    enum ha_base_keytype key_type() const
    { return zerofill ? HA_KEYTYPE_BINARY : HA_KEYTYPE_NUM; }
    int reset(void);
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char* to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    double val_real(void);
    longlong val_int(void);
    String *val_str(String*,String *);
-@@ -794,13 +886,34 @@
+@@ -794,13 +802,14 @@
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_BINARY; }
    Item_result result_type () const { return DECIMAL_RESULT; }
    int  reset(void);
 -  bool store_value(const my_decimal *decimal_value);
-+  bool store_value(const my_decimal *decimal_value)
-+  {
-+    return store_value_truncated(decimal_value, 0);
-+  }
-+  bool store_value_truncated(const my_decimal *decimal_value, bool *truncated);
++  bool store_value(const my_decimal *decimal_value, bool *truncated= NULL);
    void set_value_on_overflow(my_decimal *decimal_value, bool sign);
 -  int  store(const char *to, uint length, CHARSET_INFO *charset);
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int  store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                       bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int store_time(MYSQL_TIME *ltime, timestamp_type t_type);
 -  int  store_decimal(const my_decimal *);
-+  int store_decimal(const my_decimal *value)
-+  {
-+    return store_decimal_truncated(value, 0);
-+  }
-+  int store_decimal_truncated(const my_decimal*, bool *truncated);
++  int store_decimal(const my_decimal *value, bool *truncated= NULL);
    double val_real(void);
    longlong val_int(void);
    my_decimal *val_decimal(my_decimal *);
-@@ -837,9 +950,22 @@
+@@ -837,9 +846,10 @@
    enum_field_types type() const { return MYSQL_TYPE_TINY;}
    enum ha_base_keytype key_type() const
      { return unsigned_flag ? HA_KEYTYPE_BINARY : HA_KEYTYPE_INT8; }
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void) { ptr[0]=0; return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -886,9 +1012,22 @@
+@@ -886,9 +896,10 @@
    enum_field_types type() const { return MYSQL_TYPE_SHORT;}
    enum ha_base_keytype key_type() const
      { return unsigned_flag ? HA_KEYTYPE_USHORT_INT : HA_KEYTYPE_SHORT_INT;}
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void) { ptr[0]=ptr[1]=0; return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -955,9 +1094,22 @@
+@@ -955,9 +966,10 @@
    enum_field_types type() const { return MYSQL_TYPE_INT24;}
    enum ha_base_keytype key_type() const
      { return unsigned_flag ? HA_KEYTYPE_UINT24 : HA_KEYTYPE_INT24; }
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char* to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void) { ptr[0]=ptr[1]=ptr[2]=0; return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -1002,9 +1154,22 @@
+@@ -1002,9 +1014,10 @@
    enum_field_types type() const { return MYSQL_TYPE_LONG;}
    enum ha_base_keytype key_type() const
      { return unsigned_flag ? HA_KEYTYPE_ULONG_INT : HA_KEYTYPE_LONG_INT; }
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void) { ptr[0]=ptr[1]=ptr[2]=ptr[3]=0; return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -1051,9 +1216,22 @@
+@@ -1051,9 +1064,10 @@
    enum_field_types type() const { return MYSQL_TYPE_LONGLONG;}
    enum ha_base_keytype key_type() const
      { return unsigned_flag ? HA_KEYTYPE_ULONGLONG : HA_KEYTYPE_LONGLONG; }
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char* to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char* to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void)
    {
      ptr[0]=ptr[1]=ptr[2]=ptr[3]=ptr[4]=ptr[5]=ptr[6]=ptr[7]=0;
-@@ -1102,9 +1280,22 @@
+@@ -1102,9 +1116,10 @@
      {}
    enum_field_types type() const { return MYSQL_TYPE_FLOAT;}
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_FLOAT; }
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void) { bzero(ptr,sizeof(float)); return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -1142,9 +1333,22 @@
+@@ -1142,9 +1157,10 @@
      {not_fixed= not_fixed_arg; }
    enum_field_types type() const { return MYSQL_TYPE_DOUBLE;}
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_DOUBLE; }
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                       bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void) { bzero(ptr,sizeof(double)); return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -1173,10 +1377,58 @@
+@@ -1172,11 +1188,43 @@
+ 	       unireg_check_arg, field_name_arg, cs)
      {}
    enum_field_types type() const { return MYSQL_TYPE_NULL;}
-   int  store(const char *to, uint length, CHARSET_INFO *cs)
+-  int  store(const char *to, uint length, CHARSET_INFO *cs)
 -  { null[0]=1; return 0; }
 -  int store(double nr)   { null[0]=1; return 0; }
 -  int store(longlong nr, bool unsigned_val) { null[0]=1; return 0; }
 -  int store_decimal(const my_decimal *d)  { null[0]=1; return 0; }
-+  {
-+    return store_truncated(to, length, cs, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *cs,
-+                      bool *truncated)
++  int store(const char *to, uint length, CHARSET_INFO *cs,
++            bool *truncated= NULL)
 +  {
 +    if (truncated)
 +    {
@@ -3038,11 +2804,7 @@
 +    null[0]= 1;
 +    return 0;
 +  }
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated)
++  int store(double nr, bool *truncated= NULL)
 +  {
 +    if (truncated)
 +    {
@@ -3051,11 +2813,7 @@
 +    null[0]=1;
 +    return 0;
 +  }
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL)
 +  {
 +    if (truncated)
 +    {
@@ -3064,11 +2822,7 @@
 +    null[0]= 1;
 +    return 0;
 +  }
-+  int store_decimal(const my_decimal *d)
-+  {
-+    return store_decimal_truncated(d, 0);
-+  }
-+  int store_decimal_truncated(const my_decimal *d, bool *truncated)
++  int store_decimal(const my_decimal *d, bool *truncated= NULL)
 +  {
 +    if (truncated)
 +    {
@@ -3080,247 +2834,139 @@
    int reset(void)	  { return 0; }
    double val_real(void)		{ return 0.0;}
    longlong val_int(void)	{ return 0;}
-@@ -1203,9 +1454,22 @@
+@@ -1203,9 +1251,10 @@
    enum_field_types type() const { return MYSQL_TYPE_TIMESTAMP;}
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; }
    enum Item_result cmp_type () const { return INT_RESULT; }
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint  length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int  reset(void) { ptr[0]=ptr[1]=ptr[2]=ptr[3]=0; return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -1276,9 +1540,22 @@
+@@ -1276,9 +1325,10 @@
  		unireg_check_arg, field_name_arg, 1, 1)
      {}
    enum_field_types type() const { return MYSQL_TYPE_YEAR;}
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint  length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    double val_real(void);
    longlong val_int(void);
    String *val_str(String*,String *);
-@@ -1303,9 +1580,22 @@
+@@ -1303,9 +1353,10 @@
    enum_field_types type() const { return MYSQL_TYPE_DATE;}
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; }
    enum Item_result cmp_type () const { return INT_RESULT; }
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint  length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void) { ptr[0]=ptr[1]=ptr[2]=ptr[3]=0; return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -1348,9 +1638,22 @@
+@@ -1348,9 +1399,10 @@
    enum_field_types real_type() const { return MYSQL_TYPE_NEWDATE; }
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_UINT24; }
    enum Item_result cmp_type () const { return INT_RESULT; }
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
-+  int  store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int  store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                       bool *truncated);
-+  int  store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int  store_truncated(double nr, bool *truncated);
-+  int  store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int  store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int  store(const char *to, uint length, CHARSET_INFO *charset,
++             bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int store_time(MYSQL_TIME *ltime, timestamp_type type);
    int reset(void) { ptr[0]=ptr[1]=ptr[2]=0; return 0; }
    double val_real(void);
-@@ -1384,9 +1687,22 @@
+@@ -1384,9 +1436,10 @@
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_INT24; }
    enum Item_result cmp_type () const { return INT_RESULT; }
    int store_time(MYSQL_TIME *ltime, timestamp_type type);
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int reset(void) { ptr[0]=ptr[1]=ptr[2]=0; return 0; }
    double val_real(void);
    longlong val_int(void);
-@@ -1421,9 +1737,22 @@
+@@ -1421,9 +1474,10 @@
  #endif
    enum Item_result cmp_type () const { return INT_RESULT; }
    uint decimals() const { return DATETIME_DEC; }
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    int store_time(MYSQL_TIME *ltime, timestamp_type type);
    int reset(void)
    {
-@@ -1489,9 +1818,25 @@
+@@ -1489,9 +1543,13 @@
                            (has_charset() ? ' ' : 0));
      return 0;
    }
 -  int store(const char *to,uint length,CHARSET_INFO *charset);
 -  int store(longlong nr, bool unsigned_val);
 -  int store(double nr) { return Field_str::store(nr); } /* QQ: To be deleted */
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
-+  int store(double nr)                           /* QQ: To be deleted */
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated)/* QQ: To be deleted */
-+  {
-+    return Field_str::store_truncated(nr, truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL)       /* QQ: To be deleted */
++  {
++    return Field_str::store(nr, truncated);
 +  }
    double val_real(void);
    longlong val_int(void);
    String *val_str(String*,String *);
-@@ -1574,9 +1919,25 @@
+@@ -1574,9 +1632,13 @@
      return (uint32) field_length + (field_charset == &my_charset_bin ?
                                      length_bytes : 0);
    }
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(longlong nr, bool unsigned_val);
 -  int  store(double nr) { return Field_str::store(nr); } /* QQ: To be deleted */
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
-+  int store(double nr)                           /* QQ: To be deleted */
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated)/* QQ: To be deleted */
-+  {
-+    return Field_str::store_truncated(nr, truncated);
-+  } 
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL)       /* QQ: To be deleted */
++  {
++    return Field_str::store(nr, truncated);
++  }
    double val_real(void);
    longlong val_int(void);
    String *val_str(String*,String *);
-@@ -1668,9 +2029,22 @@
+@@ -1668,9 +1730,10 @@
    enum_field_types type() const { return MYSQL_TYPE_BLOB;}
    enum ha_base_keytype key_type() const
      { return binary() ? HA_KEYTYPE_VARBINARY2 : HA_KEYTYPE_VARTEXT2; }
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
-+  int  store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int  store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int  store(const char *to, uint length, CHARSET_INFO *charset,
++             bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    double val_real(void);
    longlong val_int(void);
    String *val_str(String*,String *);
-@@ -1824,10 +2198,27 @@
+@@ -1824,10 +1887,11 @@
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_VARBINARY2; }
    enum_field_types type() const { return MYSQL_TYPE_GEOMETRY; }
    void sql_type(String &str) const;
@@ -3328,86 +2974,46 @@
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
 -  int  store_decimal(const my_decimal *);
-+  int  store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int  store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                       bool* truncated);
-+  int  store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int  store_truncated(double nr, bool *truncated);
-+  int  store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int  store_truncated(longlong nr, bool unsigned_val, bool *truncated);
-+  int  store_decimal(const my_decimal *value)
-+  {
-+    return store_decimal_truncated(value, 0);
-+  }
-+  int  store_decimal_truncated(const my_decimal*, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++             bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
++  int store_decimal(const my_decimal *value, bool *truncated= NULL);
    uint size_of() const { return sizeof(*this); }
    int  reset(void) { return !maybe_null() || Field_blob::reset(); }
    geometry_type get_geometry_type() { return geom_type; };
-@@ -1857,9 +2247,22 @@
+@@ -1857,9 +1921,10 @@
    enum Item_result cmp_type () const { return INT_RESULT; }
    enum Item_result cast_to_int_type () const { return INT_RESULT; }
    enum ha_base_keytype key_type() const;
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(double nr);
 -  int  store(longlong nr, bool unsigned_val);
-+  int  store(const char *to, uint length,CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int  store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                       bool *truncated);
-+  int  store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int  store_truncated(double nr, bool *truncated);
-+  int  store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int  store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length,CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
    double val_real(void);
    longlong val_int(void);
    String *val_str(String*,String *);
-@@ -1899,9 +2302,25 @@
+@@ -1899,9 +1964,13 @@
      {
        flags=(flags & ~ENUM_FLAG) | SET_FLAG;
      }
 -  int  store(const char *to,uint length,CHARSET_INFO *charset);
 -  int  store(double nr) { return Field_set::store((longlong) nr, FALSE); }
 -  int  store(longlong nr, bool unsigned_val);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated)
-+  {
-+    return Field_set::store_truncated((longlong) nr, FALSE, truncated);
-+  }
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL)
++  {
++    return Field_set::store((longlong) nr, FALSE, truncated);
++  }
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
  
    virtual bool zero_pack() const { return 1; }
    String *val_str(String*,String *);
-@@ -1947,10 +2366,27 @@
+@@ -1947,10 +2016,11 @@
        clr_rec_bits(bit_ptr, bit_ofs, bit_len);
      return 0; 
    }
@@ -3415,63 +3021,36 @@
 -  int store(double nr);
 -  int store(longlong nr, bool unsigned_val);
 -  int store_decimal(const my_decimal *);
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated);
-+  int store(longlong nr, bool unsigned_val)
-+  {
-+    return store_truncated(nr, unsigned_val, 0);
-+  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated);
-+  int store_decimal(const my_decimal *value)
-+  {
-+    return store_decimal_truncated(value, 0);
-+  }
-+  int store_decimal_truncated(const my_decimal*, bool *truncated);
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL);
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL);
++  int store_decimal(const my_decimal *value, bool *truncated= NULL);
    double val_real(void);
    longlong val_int(void);
    String *val_str(String*, String *);
-@@ -2033,10 +2469,28 @@
+@@ -2033,10 +2103,16 @@
                      enum utype unireg_check_arg, const char *field_name_arg);
    enum ha_base_keytype key_type() const { return HA_KEYTYPE_BINARY; }
    uint size_of() const { return sizeof(*this); }
 -  int store(const char *to, uint length, CHARSET_INFO *charset);
 -  int store(double nr) { return Field_bit::store(nr); }
-+  int store(const char *to, uint length, CHARSET_INFO *charset)
-+  {
-+    return store_truncated(to, length, charset, 0);
-+  }
-+  int store_truncated(const char *to, uint  length, CHARSET_INFO *charset,
-+                      bool *truncated);
-+  int store(double nr)
-+  {
-+    return store_truncated(nr, 0);
-+  }
-+  int store_truncated(double nr, bool *truncated)
-+  {
-+    return Field_bit::store_truncated(nr, truncated);
-+  }
-   int store(longlong nr, bool unsigned_val)
+-  int store(longlong nr, bool unsigned_val)
 -  { return Field_bit::store(nr, unsigned_val); }
++  int store(const char *to, uint length, CHARSET_INFO *charset,
++            bool *truncated= NULL);
++  int store(double nr, bool *truncated= NULL)
 +  {
-+    return store_truncated(nr, unsigned_val, 0);
++    return Field_bit::store(nr, truncated);
 +  }
-+  int store_truncated(longlong nr, bool unsigned_val, bool *truncated)
++  int store(longlong nr, bool unsigned_val, bool *truncated= NULL)
 +  {
-+    return Field_bit::store_truncated(nr, unsigned_val, truncated);
++    return Field_bit::store(nr, unsigned_val, truncated);
 +  }
    void sql_type(String &str) const;
  };
  
-@@ -2137,6 +2591,7 @@
+@@ -2137,6 +2213,7 @@
    uint from_length,to_length;
    Field *from_field,*to_field;
    String tmp;					// For items