Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE

  -issue more correct message for incorrect date|datetime|time values
  -ER_WARN_DATA_OUT_OF_RANGE message is changed
  -added new error message


mysql-test/r/auto_increment.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/bigint.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ctype_ucs.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/date_formats.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_sapdb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_str.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_time.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/insert.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/loaddata.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/mysqldump.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_2myisam.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_3innodb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_4heap.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_5merge.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_6bdb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_7ndb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/rpl_rewrite_db.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/sp.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/strict.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/timezone2.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/timezone_grant.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_bit.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_bit_innodb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_date.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_datetime.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_decimal.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_float.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_newdecimal.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_ranges.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_time.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_uint.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/view.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/warnings.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
sql/share/errmsg.txt:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    -ER_WARN_DATA_OUT_OF_RANGE message is changed
    -added new error message
sql/time.cc:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    issue more correct message for incorrect date|datetime|time values

1 files changed, 46 insertions, 46 deletions

diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index 7ffd2de9582..5e9ab480558 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -157,20 +157,20 @@ f_float_3_1_u	0.0
 set @value= "1e+1111111111a";
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'f_double' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_7_2' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_7_2' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_4_3' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_4_3' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_3_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_3_1_u' at row 1
+Warning	1264	Out of range value for column 'f_double' at row 1
+Warning	1264	Out of range value for column 'f_float' at row 1
+Warning	1264	Out of range value for column 'f_float' at row 1
+Warning	1264	Out of range value for column 'f_double_7_2' at row 1
+Warning	1264	Out of range value for column 'f_double_7_2' at row 1
+Warning	1264	Out of range value for column 'f_float_4_3' at row 1
+Warning	1264	Out of range value for column 'f_float_4_3' at row 1
+Warning	1264	Out of range value for column 'f_double_u' at row 1
+Warning	1264	Out of range value for column 'f_float_u' at row 1
+Warning	1264	Out of range value for column 'f_float_u' at row 1
+Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
+Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	4
 original_value	1e+1111111111a
@@ -185,21 +185,21 @@ f_float_3_1_u	99.9
 set @value= "-1e+1111111111a";
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'f_double' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_7_2' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_7_2' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_4_3' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_4_3' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_3_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_3_1_u' at row 1
+Warning	1264	Out of range value for column 'f_double' at row 1
+Warning	1264	Out of range value for column 'f_float' at row 1
+Warning	1264	Out of range value for column 'f_float' at row 1
+Warning	1264	Out of range value for column 'f_double_7_2' at row 1
+Warning	1264	Out of range value for column 'f_double_7_2' at row 1
+Warning	1264	Out of range value for column 'f_float_4_3' at row 1
+Warning	1264	Out of range value for column 'f_float_4_3' at row 1
+Warning	1264	Out of range value for column 'f_double_u' at row 1
+Warning	1264	Out of range value for column 'f_double_u' at row 1
+Warning	1264	Out of range value for column 'f_float_u' at row 1
+Warning	1264	Out of range value for column 'f_float_u' at row 1
+Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
+Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	5
 original_value	-1e+1111111111a
@@ -218,12 +218,12 @@ ERROR 22007: Illegal double '1e+1111111111' value found during parsing
 set @value= 1e+111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'f_float' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_7_2' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_4_3' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_3_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float' at row 1
+Warning	1264	Out of range value for column 'f_double_7_2' at row 1
+Warning	1264	Out of range value for column 'f_float_4_3' at row 1
+Warning	1264	Out of range value for column 'f_float_u' at row 1
+Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	6
 original_value	1e+111
@@ -238,13 +238,13 @@ f_float_3_1_u	99.9
 set @value= -1e+111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'f_float' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_7_2' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_4_3' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_3_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float' at row 1
+Warning	1264	Out of range value for column 'f_double_7_2' at row 1
+Warning	1264	Out of range value for column 'f_float_4_3' at row 1
+Warning	1264	Out of range value for column 'f_double_u' at row 1
+Warning	1264	Out of range value for column 'f_float_u' at row 1
+Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	7
 original_value	-1e+111
@@ -272,10 +272,10 @@ f_float_3_1_u	1.0
 set @value= -1;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'f_double_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_double_15_1_u' at row 1
-Warning	1264	Out of range value adjusted for column 'f_float_3_1_u' at row 1
+Warning	1264	Out of range value for column 'f_double_u' at row 1
+Warning	1264	Out of range value for column 'f_float_u' at row 1
+Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
+Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	9
 original_value	-1