List:Internals« Previous MessageNext Message »
From:gluh Date:December 2 2005 11:01am
Subject:bk commit into 5.1 tree (gluh:1.2002) BUG#8294
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2002 05/12/02 15:01:44 gluh@stripped +35 -0
  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

  sql/time.cc
    1.58 05/12/02 15:01:38 gluh@stripped +9 -3
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      issue more correct message for incorrect date|datetime|time values

  sql/share/errmsg.txt
    1.57 05/12/02 15:01:38 gluh@stripped +3 -4
    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

  mysql-test/r/warnings.result
    1.37 05/12/02 15:01:38 gluh@stripped +34 -34
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/view.result
    1.138 05/12/02 15:01:37 gluh@stripped +2 -2
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_uint.result
    1.12 05/12/02 15:01:37 gluh@stripped +2 -2
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_time.result
    1.14 05/12/02 15:01:37 gluh@stripped +3 -3
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_ranges.result
    1.39 05/12/02 15:01:37 gluh@stripped +21 -21
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_newdecimal.result
    1.39 05/12/02 15:01:37 gluh@stripped +33 -33
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_float.result
    1.43 05/12/02 15:01:37 gluh@stripped +15 -15
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_decimal.result
    1.39 05/12/02 15:01:37 gluh@stripped +54 -54
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_datetime.result
    1.31 05/12/02 15:01:37 gluh@stripped +15 -15
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_date.result
    1.14 05/12/02 15:01:37 gluh@stripped +1 -1
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_bit_innodb.result
    1.4 05/12/02 15:01:37 gluh@stripped +2 -2
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/type_bit.result
    1.15 05/12/02 15:01:37 gluh@stripped +3 -3
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/timezone_grant.result
    1.4 05/12/02 15:01:37 gluh@stripped +1 -1
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/timezone2.result
    1.13 05/12/02 15:01:37 gluh@stripped +9 -9
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/strict.result
    1.27 05/12/02 15:01:37 gluh@stripped +175 -175
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/sp.result
    1.173 05/12/02 15:01:37 gluh@stripped +1 -1
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/rpl_rewrite_db.result
    1.5 05/12/02 15:01:37 gluh@stripped +3 -3
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/ps_7ndb.result
    1.40 05/12/02 15:01:37 gluh@stripped +68 -68
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/ps_6bdb.result
    1.41 05/12/02 15:01:37 gluh@stripped +68 -68
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/ps_5merge.result
    1.40 05/12/02 15:01:36 gluh@stripped +136 -136
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/ps_4heap.result
    1.39 05/12/02 15:01:36 gluh@stripped +68 -68
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/ps_3innodb.result
    1.43 05/12/02 15:01:36 gluh@stripped +68 -68
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/ps_2myisam.result
    1.40 05/12/02 15:01:36 gluh@stripped +68 -68
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/mysqldump.result
    1.87 05/12/02 15:01:36 gluh@stripped +1 -1
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/loaddata.result
    1.21 05/12/02 15:01:36 gluh@stripped +3 -3
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/insert.result
    1.24 05/12/02 15:01:36 gluh@stripped +46 -46
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/func_time.result
    1.48 05/12/02 15:01:36 gluh@stripped +16 -16
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/func_str.result
    1.110 05/12/02 15:01:36 gluh@stripped +6 -6
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/func_sapdb.result
    1.16 05/12/02 15:01:36 gluh@stripped +3 -3
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/date_formats.result
    1.19 05/12/02 15:01:36 gluh@stripped +2 -2
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/ctype_ucs.result
    1.40 05/12/02 15:01:36 gluh@stripped +1 -1
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/bigint.result
    1.32 05/12/02 15:01:36 gluh@stripped +7 -7
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

  mysql-test/r/auto_increment.result
    1.36 05/12/02 15:01:36 gluh@stripped +1 -1
    Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
      result change

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.1-new

--- 1.57/sql/time.cc	Sun Jul 31 14:49:47 2005
+++ 1.58/sql/time.cc	Fri Dec  2 15:01:38 2005
@@ -711,9 +711,15 @@ void make_truncated_value_warning(THD *t
                        type_str, str.c_ptr(), field_name,
                        (ulong) thd->row_count);
   else
-    cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
-                       ER(ER_TRUNCATED_WRONG_VALUE),
-                       type_str, str.c_ptr());
+  {
+    if (time_type > MYSQL_TIMESTAMP_ERROR)
+      cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
+                         ER(ER_TRUNCATED_WRONG_VALUE),
+                         type_str, str.c_ptr());
+    else
+      cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
+                         ER(ER_WRONG_VALUE), type_str, str.c_ptr());
+  }
   push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                ER_TRUNCATED_WRONG_VALUE, warn_buff);
 }

--- 1.56/sql/share/errmsg.txt	Thu Nov 24 04:56:09 2005
+++ 1.57/sql/share/errmsg.txt	Fri Dec  2 15:01:38 2005
@@ -4898,10 +4898,7 @@ ER_WARN_NULL_TO_NOTNULL 22004 
 	por "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld"
 ER_WARN_DATA_OUT_OF_RANGE 22003 
-	eng "Out of range value adjusted for column '%s' at row %ld"
-	por "Dado truncado, fora de alcance para coluna '%s' na linha %ld"
+	eng "Out of range value for column '%s' at row %ld"
 WARN_DATA_TRUNCATED 01000 
 	eng "Data truncated for column '%s' at row %ld"
@@ -5721,3 +5718,5 @@ ER_DROP_PARTITION_WHEN_FK_DEFINED
 ER_PLUGIN_IS_NOT_LOADED
 	eng "Plugin '%-.64s' is not loaded"
+ER_WRONG_VALUE
+	eng "Incorrect %-.32s value: '%-.128s'"

--- 1.39/mysql-test/r/ctype_ucs.result	Thu Oct  6 17:36:53 2005
+++ 1.40/mysql-test/r/ctype_ucs.result	Fri Dec  2 15:01:36 2005
@@ -671,7 +671,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (Field1 int(10) unsigned default '0');
 INSERT INTO t1 VALUES ('-1');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'Field1' at row 1
+Warning	1264	Out of range value for column 'Field1' at row 1
 DROP TABLE t1;
 SET NAMES latin1;
 CREATE TABLE t1 (

--- 1.137/mysql-test/r/view.result	Thu Dec  1 15:30:05 2005
+++ 1.138/mysql-test/r/view.result	Fri Dec  2 15:01:37 2005
@@ -1306,9 +1306,9 @@ a	b
 delete from t1;
 load data infile '../../std_data/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 Error	1369	CHECK OPTION failed 'test.v1'
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 Error	1369	CHECK OPTION failed 'test.v1'
 select * from t1;
 a	b

--- 1.12/mysql-test/r/timezone2.result	Tue Jul 19 04:12:40 2005
+++ 1.13/mysql-test/r/timezone2.result	Fri Dec  2 15:01:37 2005
@@ -117,9 +117,9 @@ insert into t1 values ('0000-00-00 00:00
 ('1970-01-01 00:00:00'),('1970-01-01 00:00:01'),
 ('2037-12-31 23:59:59'),('2038-01-01 00:00:00');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'ts' at row 2
-Warning	1264	Out of range value adjusted for column 'ts' at row 3
-Warning	1264	Out of range value adjusted for column 'ts' at row 6
+Warning	1264	Out of range value for column 'ts' at row 2
+Warning	1264	Out of range value for column 'ts' at row 3
+Warning	1264	Out of range value for column 'ts' at row 6
 select * from t1;
 ts
 0000-00-00 00:00:00
@@ -134,9 +134,9 @@ insert into t1 values ('0000-00-00 00:00
 ('1970-01-01 01:00:00'),('1970-01-01 01:00:01'),
 ('2038-01-01 00:59:59'),('2038-01-01 01:00:00');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'ts' at row 2
-Warning	1264	Out of range value adjusted for column 'ts' at row 3
-Warning	1264	Out of range value adjusted for column 'ts' at row 6
+Warning	1264	Out of range value for column 'ts' at row 2
+Warning	1264	Out of range value for column 'ts' at row 3
+Warning	1264	Out of range value for column 'ts' at row 6
 select * from t1;
 ts
 0000-00-00 00:00:00
@@ -151,9 +151,9 @@ insert into t1 values ('0000-00-00 00:00
 ('1970-01-01 01:30:00'),('1970-01-01 01:30:01'),
 ('2038-01-01 01:29:59'),('2038-01-01 01:30:00');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'ts' at row 2
-Warning	1264	Out of range value adjusted for column 'ts' at row 3
-Warning	1264	Out of range value adjusted for column 'ts' at row 6
+Warning	1264	Out of range value for column 'ts' at row 2
+Warning	1264	Out of range value for column 'ts' at row 3
+Warning	1264	Out of range value for column 'ts' at row 6
 select * from t1;
 ts
 0000-00-00 00:00:00

--- 1.18/mysql-test/r/date_formats.result	Thu Oct 27 22:04:31 2005
+++ 1.19/mysql-test/r/date_formats.result	Fri Dec  2 15:01:36 2005
@@ -401,14 +401,14 @@ date	format	str_to_date
 2003-01-02 10:11:12	%Y-%m-%d %h:%i:%S	2003-01-02 10:11:12
 03-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	0003-01-02 22:11:12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '10:20:10AM'
+Warning	1292	Incorrect datetime value: '10:20:10AM'
 select date,format,concat(str_to_date(date, format),'') as con from t1;
 date	format	con
 10:20:10AM	%h:%i:%s	0000-00-00 10:20:10
 2003-01-02 10:11:12	%Y-%m-%d %h:%i:%S	2003-01-02 10:11:12
 03-01-02 10:11:12 PM	%Y-%m-%d %h:%i:%S %p	0003-01-02 22:11:12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '10:20:10AM'
+Warning	1292	Incorrect datetime value: '10:20:10AM'
 drop table t1;
 select get_format(DATE, 'USA') as a;
 a

--- 1.15/mysql-test/r/func_sapdb.result	Tue Nov  1 20:47:51 2005
+++ 1.16/mysql-test/r/func_sapdb.result	Fri Dec  2 15:01:36 2005
@@ -68,7 +68,7 @@ select datediff("1997-11-31 23:59:59.000
 datediff("1997-11-31 23:59:59.000001","1997-12-31")
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1997-11-31 23:59:59.000001'
+Warning	1292	Incorrect datetime value: '1997-11-31 23:59:59.000001'
 select datediff("1997-11-30 23:59:59.000001",null);
 datediff("1997-11-30 23:59:59.000001",null)
 NULL
@@ -133,7 +133,7 @@ select timestamp("2001-13-01", "01:01:01
 timestamp("2001-13-01", "01:01:01.000001")
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2001-13-01'
+Warning	1292	Incorrect datetime value: '2001-13-01'
 select timestamp("2001-12-01", "25:01:01");
 timestamp("2001-12-01", "25:01:01")
 2001-12-02 01:01:01
@@ -153,7 +153,7 @@ select date("1997-13-31 23:59:59.000001"
 date("1997-13-31 23:59:59.000001")
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1997-13-31 23:59:59.000001'
+Warning	1292	Incorrect datetime value: '1997-13-31 23:59:59.000001'
 select time("1997-12-31 23:59:59.000001");
 time("1997-12-31 23:59:59.000001")
 23:59:59.000001

--- 1.39/mysql-test/r/ps_2myisam.result	Thu Dec  1 15:30:05 2005
+++ 1.40/mysql-test/r/ps_2myisam.result	Fri Dec  2 15:01:36 2005
@@ -2570,12 +2570,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2593,12 +2593,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2616,12 +2616,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2639,12 +2639,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2662,14 +2662,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2693,8 +2693,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	1
 c2	1
@@ -2712,14 +2712,14 @@ set @arg00= -1.11111111111111111111e+50 
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2743,8 +2743,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-1
 c2	-1
@@ -2975,45 +2975,45 @@ Warning	1265	Data truncated for column '
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
 c1	c13	c14	c15	c16	c17
 20	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991

--- 1.42/mysql-test/r/ps_3innodb.result	Thu Dec  1 15:30:05 2005
+++ 1.43/mysql-test/r/ps_3innodb.result	Fri Dec  2 15:01:36 2005
@@ -2553,12 +2553,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2576,12 +2576,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2599,12 +2599,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2622,12 +2622,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2645,14 +2645,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2676,8 +2676,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	1
 c2	1
@@ -2695,14 +2695,14 @@ set @arg00= -1.11111111111111111111e+50 
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2726,8 +2726,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-1
 c2	-1
@@ -2958,45 +2958,45 @@ Warning	1265	Data truncated for column '
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
 c1	c13	c14	c15	c16	c17
 20	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991

--- 1.38/mysql-test/r/ps_4heap.result	Thu Dec  1 15:30:05 2005
+++ 1.39/mysql-test/r/ps_4heap.result	Fri Dec  2 15:01:36 2005
@@ -2554,12 +2554,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2577,12 +2577,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2600,12 +2600,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2623,12 +2623,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2646,14 +2646,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2677,8 +2677,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	1
 c2	1
@@ -2696,14 +2696,14 @@ set @arg00= -1.11111111111111111111e+50 
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2727,8 +2727,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-1
 c2	-1
@@ -2959,45 +2959,45 @@ Warning	1265	Data truncated for column '
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
 c1	c13	c14	c15	c16	c17
 20	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991

--- 1.39/mysql-test/r/ps_5merge.result	Thu Dec  1 15:30:05 2005
+++ 1.40/mysql-test/r/ps_5merge.result	Fri Dec  2 15:01:36 2005
@@ -2490,12 +2490,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2513,12 +2513,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2536,12 +2536,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2559,12 +2559,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2582,14 +2582,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2613,8 +2613,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	1
 c2	1
@@ -2632,14 +2632,14 @@ set @arg00= -1.11111111111111111111e+50 
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2663,8 +2663,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-1
 c2	-1
@@ -2895,45 +2895,45 @@ Warning	1265	Data truncated for column '
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
 c1	c13	c14	c15	c16	c17
 20	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
@@ -5502,12 +5502,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -5525,12 +5525,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -5548,12 +5548,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -5571,12 +5571,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -5594,14 +5594,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -5625,8 +5625,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	1
 c2	1
@@ -5644,14 +5644,14 @@ set @arg00= -1.11111111111111111111e+50 
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -5675,8 +5675,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-1
 c2	-1
@@ -5907,45 +5907,45 @@ Warning	1265	Data truncated for column '
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
 c1	c13	c14	c15	c16	c17
 20	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991

--- 1.40/mysql-test/r/ps_6bdb.result	Thu Dec  1 15:30:05 2005
+++ 1.41/mysql-test/r/ps_6bdb.result	Fri Dec  2 15:01:37 2005
@@ -2553,12 +2553,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2576,12 +2576,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2599,12 +2599,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2622,12 +2622,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2645,14 +2645,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2676,8 +2676,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	1
 c2	1
@@ -2695,14 +2695,14 @@ set @arg00= -1.11111111111111111111e+50 
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2726,8 +2726,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-1
 c2	-1
@@ -2958,45 +2958,45 @@ Warning	1265	Data truncated for column '
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
 c1	c13	c14	c15	c16	c17
 20	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991

--- 1.4/mysql-test/r/rpl_rewrite_db.result	Wed Apr  6 21:15:28 2005
+++ 1.5/mysql-test/r/rpl_rewrite_db.result	Fri Dec  2 15:01:37 2005
@@ -67,9 +67,9 @@ drop table t1;
 create table t1 (a int, b char(10));
 load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 Warning	1262	Row 3 was truncated; it contained more data than there were input columns
-Warning	1264	Out of range value adjusted for column 'a' at row 5
+Warning	1264	Out of range value for column 'a' at row 5
 Warning	1262	Row 5 was truncated; it contained more data than there were input columns
 select * from rewrite.t1;
 a	b
@@ -81,7 +81,7 @@ a	b
 truncate table t1;
 load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 Warning	1261	Row 4 doesn't contain data for all columns
 select * from rewrite.t1;
 a	b

--- 1.38/mysql-test/r/type_newdecimal.result	Tue Nov 29 16:58:25 2005
+++ 1.39/mysql-test/r/type_newdecimal.result	Fri Dec  2 15:01:37 2005
@@ -79,16 +79,16 @@ drop table t1;
 create table t1 (a decimal(4,2));
 insert into t1 value (10000), (1.1e10), ("11111"), (100000.1);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 4
 insert into t1 value (-10000), (-1.1e10), ("-11111"), (-100000.1);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 4
 select a from t1;
 a
 99.99
@@ -103,16 +103,16 @@ drop table t1;
 create table t1 (a decimal(4,2) unsigned);
 insert into t1 value (10000), (1.1e10), ("11111"), (100000.1);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 4
 insert into t1 value (-10000), (-1.1e10), ("-11111"), (-100000.1);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 4
 select a from t1;
 a
 99.99
@@ -127,13 +127,13 @@ drop table t1;
 create table t1 (a bigint);
 insert into t1 values (18446744073709551615.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 insert into t1 values (9223372036854775808.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 insert into t1 values (-18446744073709551615.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 9223372036854775807
@@ -145,10 +145,10 @@ insert into t1 values (18446744073709551
 insert into t1 values (9223372036854775808.0);
 insert into t1 values (9999999999999999999999999.000);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 insert into t1 values (-1.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 18446744073709551615
@@ -159,12 +159,12 @@ drop table t1;
 create table t1 (a tinyint);
 insert into t1 values (18446744073709551615.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 insert into t1 values (9223372036854775808.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 127
@@ -806,9 +806,9 @@ Warnings:
 Note	1265	Data truncated for column 'col1' at row 1
 INSERT INTO Sow6_2f VALUES (11);
 INSERT INTO Sow6_2f VALUES (101.55);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 UPDATE Sow6_2f SET col1 = col1 * 50 WHERE col1 = 11;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 5
+ERROR 22003: Out of range value for column 'col1' at row 5
 UPDATE Sow6_2f SET col1 = col1 / 0 WHERE col1 > 0;
 ERROR 22012: Division by 0
 SELECT MOD(col1,0) FROM Sow6_2f;
@@ -872,13 +872,13 @@ NULL
 set @@sql_mode='traditional';
 create table t1( d1 decimal(18) unsigned, d2 decimal(20) unsigned, d3 decimal (22) unsigned);
 insert into t1 values(1,-1,-1);
-ERROR 22003: Out of range value adjusted for column 'd2' at row 1
+ERROR 22003: Out of range value for column 'd2' at row 1
 drop table t1;
 create table t1 (col1 decimal(5,2), col2 numeric(5,2));
 insert into t1 values (999.999,999.999);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 insert into t1 values (-999.999,-999.999);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 select * from t1;
 col1	col2
 drop table t1;
@@ -1379,7 +1379,7 @@ insert into t1 values(
 89000000000000000000000000000000000000000000000000000000000000000000000000000000000000000);
 Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
 insert into t1 values(
 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 *
 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999);
@@ -1387,10 +1387,10 @@ Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
 Error	1292	Truncated incorrect DECIMAL value: ''
 Error	1292	Truncated incorrect DECIMAL value: ''
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
 insert into t1 values(1e100);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
 select * from t1;
 c1
 9999999999999999999999999999999999999999999999999999999999999999

--- 1.3/mysql-test/r/timezone_grant.result	Tue Jul 19 01:49:14 2005
+++ 1.4/mysql-test/r/timezone_grant.result	Fri Dec  2 15:01:37 2005
@@ -38,7 +38,7 @@ select convert_tz('2004-11-31 12:00:00',
 convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC')
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2004-11-31 12:00:00'
+Warning	1292	Incorrect datetime value: '2004-11-31 12:00:00'
 select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
 convert_tz(b, 'Europe/Moscow', 'UTC')
 update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')

--- 1.39/mysql-test/r/ps_7ndb.result	Thu Dec  1 15:30:05 2005
+++ 1.40/mysql-test/r/ps_7ndb.result	Fri Dec  2 15:01:37 2005
@@ -2553,12 +2553,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2576,12 +2576,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2599,12 +2599,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2622,12 +2622,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2645,14 +2645,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	127
 c2	32767
@@ -2676,8 +2676,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	1
 c2	1
@@ -2695,14 +2695,14 @@ set @arg00= -1.11111111111111111111e+50 
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2726,8 +2726,8 @@ Warning	1265	Data truncated for column '
 Warning	1265	Data truncated for column 'c4' at row 1
 Warning	1265	Data truncated for column 'c5' at row 1
 Warning	1265	Data truncated for column 'c6' at row 1
-Warning	1264	Out of range value adjusted for column 'c7' at row 1
-Warning	1264	Out of range value adjusted for column 'c12' at row 1
+Warning	1264	Out of range value for column 'c7' at row 1
+Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
 c1	-1
 c2	-1
@@ -2958,45 +2958,45 @@ Warning	1265	Data truncated for column '
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c13' at row 1
-Warning	1264	Out of range value adjusted for column 'c14' at row 1
+Warning	1264	Out of range value for column 'c13' at row 1
+Warning	1264	Out of range value for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value adjusted for column 'c16' at row 1
-Warning	1264	Out of range value adjusted for column 'c17' at row 1
+Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1264	Out of range value for column 'c17' at row 1
 select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
 c1	c13	c14	c15	c16	c17
 20	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991

--- 1.35/mysql-test/r/auto_increment.result	Thu Dec  1 15:30:04 2005
+++ 1.36/mysql-test/r/auto_increment.result	Fri Dec  2 15:01:36 2005
@@ -163,7 +163,7 @@ last_insert_id()
 255
 insert into t1 set i = null;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'i' at row 1
+Warning	1264	Out of range value for column 'i' at row 1
 select last_insert_id();
 last_insert_id()
 255

--- 1.31/mysql-test/r/bigint.result	Tue Oct 25 20:28:07 2005
+++ 1.32/mysql-test/r/bigint.result	Fri Dec  2 15:01:36 2005
@@ -47,7 +47,7 @@ drop table t1;
 create table t1 ( a int not null default 1, big bigint );
 insert into t1 (big) values (-1),(12345678901234567),(9223372036854775807),(18446744073709551615);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'big' at row 4
+Warning	1264	Out of range value for column 'big' at row 4
 select * from t1;
 a	big
 1	-1
@@ -62,7 +62,7 @@ min(big)	max(big)	max(big)-1
 -1	9223372036854775807	9223372036854775806
 alter table t1 modify big bigint unsigned not null;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'big' at row 1
+Warning	1264	Out of range value for column 'big' at row 1
 select min(big),max(big),max(big)-1 from t1;
 min(big)	max(big)	max(big)-1
 0	9223372036854775807	9223372036854775806
@@ -92,7 +92,7 @@ min(big)	max(big)	max(big)-1
 0	18446744073709551615	18446744073709551614
 alter table t1 modify big bigint not null;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'big' at row 5
+Warning	1264	Out of range value for column 'big' at row 5
 select * from t1;
 a	big
 1	0
@@ -204,10 +204,10 @@ drop table t1;
 create table t1 ( quantity decimal(2) unsigned);
 insert into t1 values (500), (-500), (~0), (-1);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'quantity' at row 1
-Warning	1264	Out of range value adjusted for column 'quantity' at row 2
-Warning	1264	Out of range value adjusted for column 'quantity' at row 3
-Warning	1264	Out of range value adjusted for column 'quantity' at row 4
+Warning	1264	Out of range value for column 'quantity' at row 1
+Warning	1264	Out of range value for column 'quantity' at row 2
+Warning	1264	Out of range value for column 'quantity' at row 3
+Warning	1264	Out of range value for column 'quantity' at row 4
 select * from t1;
 quantity
 99

--- 1.47/mysql-test/r/func_time.result	Fri Oct 14 03:32:28 2005
+++ 1.48/mysql-test/r/func_time.result	Fri Dec  2 15:01:36 2005
@@ -311,7 +311,7 @@ select date_sub("0000-00-00 00:00:00",IN
 date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 00:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 00:00:00'
 select date_add('1998-01-30',Interval 1 month);
 date_add('1998-01-30',Interval 1 month)
 1998-02-28
@@ -428,12 +428,12 @@ SELECT month(updated) from t1;
 month(updated)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: ''
 SELECT year(updated) from t1;
 year(updated)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: ''
 drop table t1;
 create table t1 (d date, dt datetime, t timestamp, c char(10));
 insert into t1 values ("0000-00-00", "0000-00-00", "0000-00-00", "0000-00-00");
@@ -441,8 +441,8 @@ select dayofyear("0000-00-00"),dayofyear
 dayofyear("0000-00-00")	dayofyear(d)	dayofyear(dt)	dayofyear(t)	dayofyear(c)
 NULL	NULL	NULL	NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
 select dayofmonth("0000-00-00"),dayofmonth(d),dayofmonth(dt),dayofmonth(t),dayofmonth(c) from t1;
 dayofmonth("0000-00-00")	dayofmonth(d)	dayofmonth(dt)	dayofmonth(t)	dayofmonth(c)
 0	0	0	0	0
@@ -456,8 +456,8 @@ select week("0000-00-00"),week(d),week(d
 week("0000-00-00")	week(d)	week(dt)	week(t)	week(c)
 NULL	NULL	NULL	NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
 select year("0000-00-00"),year(d),year(dt),year(t),year(c) from t1;
 year("0000-00-00")	year(d)	year(dt)	year(t)	year(c)
 0	0	0	0	0
@@ -465,14 +465,14 @@ select yearweek("0000-00-00"),yearweek(d
 yearweek("0000-00-00")	yearweek(d)	yearweek(dt)	yearweek(t)	yearweek(c)
 NULL	NULL	NULL	NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
 select to_days("0000-00-00"),to_days(d),to_days(dt),to_days(t),to_days(c) from t1;
 to_days("0000-00-00")	to_days(d)	to_days(dt)	to_days(t)	to_days(c)
 NULL	NULL	NULL	NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
 select extract(MONTH FROM "0000-00-00"),extract(MONTH FROM d),extract(MONTH FROM dt),extract(MONTH FROM t),extract(MONTH FROM c) from t1;
 extract(MONTH FROM "0000-00-00")	extract(MONTH FROM d)	extract(MONTH FROM dt)	extract(MONTH FROM t)	extract(MONTH FROM c)
 0	0	0	0	0
@@ -628,7 +628,7 @@ select date_add(time,INTERVAL 1 SECOND) 
 date_add(time,INTERVAL 1 SECOND)
 NULL
 Warnings:
-Warning	1264	Out of range value adjusted for column 'time' at row 1
+Warning	1264	Out of range value for column 'time' at row 1
 drop table t1;
 select last_day('2000-02-05') as f1, last_day('2002-12-31') as f2,
 last_day('2003-03-32') as f3, last_day('2003-04-01') as f4,
@@ -637,7 +637,7 @@ last_day('2001-02-12');
 f1	f2	f3	f4	f5	last_day(NULL)	last_day('2001-02-12')
 2000-02-29	2002-12-31	NULL	2003-04-30	2001-01-31	NULL	2001-02-28
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2003-03-32'
+Warning	1292	Incorrect datetime value: '2003-03-32'
 create table t1 select last_day('2000-02-05') as a,
 from_days(to_days("960101")) as b;
 describe t1;
@@ -706,17 +706,17 @@ select last_day('2005-00-00');
 last_day('2005-00-00')
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2005-00-00'
+Warning	1292	Incorrect datetime value: '2005-00-00'
 select last_day('2005-00-01');
 last_day('2005-00-01')
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2005-00-01'
+Warning	1292	Incorrect datetime value: '2005-00-01'
 select last_day('2005-01-00');
 last_day('2005-01-00')
 NULL
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '2005-01-00'
+Warning	1292	Incorrect datetime value: '2005-01-00'
 select time_format('100:00:00', '%H %k %h %I %l');
 time_format('100:00:00', '%H %k %h %I %l')
 100 100 04 04 4

--- 1.23/mysql-test/r/insert.result	Thu Dec  1 15:30:04 2005
+++ 1.24/mysql-test/r/insert.result	Fri Dec  2 15:01:36 2005
@@ -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+11111111
 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

--- 1.13/mysql-test/r/type_date.result	Sat Feb  5 20:53:51 2005
+++ 1.14/mysql-test/r/type_date.result	Fri Dec  2 15:01:37 2005
@@ -99,7 +99,7 @@ DROP TABLE t1, t2, t3;
 CREATE TABLE t1 (y YEAR);
 INSERT INTO t1 VALUES ('abc');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'y' at row 1
+Warning	1264	Out of range value for column 'y' at row 1
 SELECT * FROM t1;
 y
 0000

--- 1.30/mysql-test/r/type_datetime.result	Thu Aug 11 22:42:03 2005
+++ 1.31/mysql-test/r/type_datetime.result	Fri Dec  2 15:01:37 2005
@@ -52,7 +52,7 @@ t
 truncate table t1;
 insert into t1 values("2003-0303 12:13:14");
 Warnings:
-Warning	1264	Out of range value adjusted for column 't' at row 1
+Warning	1264	Out of range value for column 't' at row 1
 select * from t1;
 t
 0000-00-00 00:00:00
@@ -113,12 +113,12 @@ create table t1 (t datetime);
 insert into t1 values (20030102030460),(20030102036301),(20030102240401),
 (20030132030401),(20031302030401),(100001202030401);
 Warnings:
-Warning	1264	Out of range value adjusted for column 't' at row 1
-Warning	1264	Out of range value adjusted for column 't' at row 2
-Warning	1264	Out of range value adjusted for column 't' at row 3
-Warning	1264	Out of range value adjusted for column 't' at row 4
-Warning	1264	Out of range value adjusted for column 't' at row 5
-Warning	1264	Out of range value adjusted for column 't' at row 6
+Warning	1264	Out of range value for column 't' at row 1
+Warning	1264	Out of range value for column 't' at row 2
+Warning	1264	Out of range value for column 't' at row 3
+Warning	1264	Out of range value for column 't' at row 4
+Warning	1264	Out of range value for column 't' at row 5
+Warning	1264	Out of range value for column 't' at row 6
 select * from t1;
 t
 0000-00-00 00:00:00
@@ -132,12 +132,12 @@ insert into t1 values
 ("2003-01-02 03:04:60"),("2003-01-02 03:63:01"),("2003-01-02 24:04:01"),
 ("2003-01-32 03:04:01"),("2003-13-02 03:04:01"), ("10000-12-02 03:04:00");
 Warnings:
-Warning	1264	Out of range value adjusted for column 't' at row 1
-Warning	1264	Out of range value adjusted for column 't' at row 2
-Warning	1264	Out of range value adjusted for column 't' at row 3
-Warning	1264	Out of range value adjusted for column 't' at row 4
-Warning	1264	Out of range value adjusted for column 't' at row 5
-Warning	1264	Out of range value adjusted for column 't' at row 6
+Warning	1264	Out of range value for column 't' at row 1
+Warning	1264	Out of range value for column 't' at row 2
+Warning	1264	Out of range value for column 't' at row 3
+Warning	1264	Out of range value for column 't' at row 4
+Warning	1264	Out of range value for column 't' at row 5
+Warning	1264	Out of range value for column 't' at row 6
 select * from t1;
 t
 0000-00-00 00:00:00
@@ -149,8 +149,8 @@ t
 delete from t1;
 insert into t1 values ("0000-00-00 00:00:00 some trailer"),("2003-01-01 00:00:00 some trailer");
 Warnings:
-Warning	1264	Out of range value adjusted for column 't' at row 1
-Warning	1264	Out of range value adjusted for column 't' at row 2
+Warning	1264	Out of range value for column 't' at row 1
+Warning	1264	Out of range value for column 't' at row 2
 select * from t1;
 t
 0000-00-00 00:00:00

--- 1.38/mysql-test/r/type_decimal.result	Tue Oct 11 14:58:20 2005
+++ 1.39/mysql-test/r/type_decimal.result	Fri Dec  2 15:01:37 2005
@@ -157,25 +157,25 @@ insert into t1 values ("-.1"),("+.1"),("
 insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
 insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
 insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("1e+4294967296"),("1e-4294967296");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
 insert into t1 values ("1e+18446744073709551615"),("1e+18446744073709551616"),("1e-9223372036854775807"),("1e-9223372036854775809");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 Warning	1366	Incorrect decimal value: '1e+18446744073709551616' for column 'a' at row 2
 Note	1265	Data truncated for column 'a' at row 3
 Warning	1366	Incorrect decimal value: '1e-9223372036854775809' for column 'a' at row 4
@@ -221,29 +221,29 @@ drop  table t1;
 create table t1 (a decimal(10,2) unsigned);
 insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 6
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 6
 insert into t1 values ("-.1"),("+.1"),(".1");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
 Warnings:
 Note	1265	Data truncated for column 'a' at row 1
@@ -280,29 +280,29 @@ drop  table t1;
 create table t1 (a decimal(10,2) zerofill);
 insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 6
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 6
 insert into t1 values ("-.1"),("+.1"),(".1");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
 Warnings:
 Note	1265	Data truncated for column 'a' at row 1
@@ -342,18 +342,18 @@ insert into t1 values (-.1),(+.1),(.1);
 insert into t1 values (00000000000001),(+0000000000001),(-0000000000001);
 insert into t1 values (+111111111.11),(111111111.11),(-11111111.11);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
 insert into t1 values (-111111111.11),(+1111111111.11),(1111111111.11);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values (1e+100),(1e-100),(-1e+100);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 insert into t1 values (123.4e0),(123.4e+2),(123.4e-2),(123e1),(123e+0);
 Warnings:
 Note	1265	Data truncated for column 'a' at row 3
@@ -393,9 +393,9 @@ drop  table t1;
 create table t1 (a decimal);
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('+12345678901'),(99999999999999);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 6
-Warning	1264	Out of range value adjusted for column 'a' at row 7
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 6
+Warning	1264	Out of range value for column 'a' at row 7
 select * from t1;
 a
 -9999999999
@@ -409,9 +409,9 @@ drop  table t1;
 create table t1 (a decimal unsigned);
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('+1234567890'),(99999999999999);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 7
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 7
 select * from t1;
 a
 0
@@ -425,9 +425,9 @@ drop  table t1;
 create table t1 (a decimal zerofill);
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('+1234567890'),(99999999999999);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 7
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 7
 select * from t1;
 a
 0000000000
@@ -441,9 +441,9 @@ drop  table t1;
 create table t1 (a decimal unsigned zerofill);
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('+1234567890'),(99999999999999);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 7
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 7
 select * from t1;
 a
 0000000000
@@ -457,14 +457,14 @@ drop  table t1;
 create table t1(a decimal(10,0));
 insert into t1 values ("1e4294967295");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 9999999999
 delete from t1;
 insert into t1 values("1e4294967297");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 9999999999

--- 1.42/mysql-test/r/type_float.result	Tue Oct 11 16:38:16 2005
+++ 1.43/mysql-test/r/type_float.result	Fri Dec  2 15:01:37 2005
@@ -24,8 +24,8 @@ f1	float	NULL	YES		NULL		#	
 f2	double	NULL	YES		NULL		#	
 insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 7
-Warning	1264	Out of range value adjusted for column 'f1' at row 8
+Warning	1264	Out of range value for column 'f1' at row 7
+Warning	1264	Out of range value for column 'f1' at row 8
 insert into t1 values(-10,-10),(1e-5,1e-5),(1e-10,1e-10),(1e-15,1e-15),(1e-20,1e-20),(1e-50,1e-50),(1e-150,1e-150);
 select * from t1;
 f1	f2
@@ -149,7 +149,7 @@ create table t1 (d1 double, d2 double un
 insert into t1 set d1 = -1.0;
 update t1 set d2 = d1;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'd2' at row 1
+Warning	1264	Out of range value for column 'd2' at row 1
 select * from t1;
 d1	d2
 -1	0
@@ -157,12 +157,12 @@ drop table t1;
 create table t1 (f float(4,3));
 insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'f' at row 1
-Warning	1264	Out of range value adjusted for column 'f' at row 2
-Warning	1264	Out of range value adjusted for column 'f' at row 3
-Warning	1264	Out of range value adjusted for column 'f' at row 4
-Warning	1264	Out of range value adjusted for column 'f' at row 5
-Warning	1264	Out of range value adjusted for column 'f' at row 6
+Warning	1264	Out of range value for column 'f' at row 1
+Warning	1264	Out of range value for column 'f' at row 2
+Warning	1264	Out of range value for column 'f' at row 3
+Warning	1264	Out of range value for column 'f' at row 4
+Warning	1264	Out of range value for column 'f' at row 5
+Warning	1264	Out of range value for column 'f' at row 6
 select * from t1;
 f
 -9.999
@@ -175,12 +175,12 @@ drop table if exists t1;
 create table t1 (f double(4,3));
 insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'f' at row 1
-Warning	1264	Out of range value adjusted for column 'f' at row 2
-Warning	1264	Out of range value adjusted for column 'f' at row 3
-Warning	1264	Out of range value adjusted for column 'f' at row 4
-Warning	1264	Out of range value adjusted for column 'f' at row 5
-Warning	1264	Out of range value adjusted for column 'f' at row 6
+Warning	1264	Out of range value for column 'f' at row 1
+Warning	1264	Out of range value for column 'f' at row 2
+Warning	1264	Out of range value for column 'f' at row 3
+Warning	1264	Out of range value for column 'f' at row 4
+Warning	1264	Out of range value for column 'f' at row 5
+Warning	1264	Out of range value for column 'f' at row 6
 select * from t1;
 f
 -9.999

--- 1.38/mysql-test/r/type_ranges.result	Tue Nov 29 16:46:46 2005
+++ 1.39/mysql-test/r/type_ranges.result	Fri Dec  2 15:01:37 2005
@@ -91,35 +91,35 @@ Warnings:
 Warning	1265	Data truncated for column 'string' at row 1
 insert into t1 values (0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,NULL,19970807,080706,19970403090807,-1,-1,-1,'-1',-1,-1);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'utiny' at row 1
-Warning	1264	Out of range value adjusted for column 'ushort' at row 1
-Warning	1264	Out of range value adjusted for column 'umedium' at row 1
-Warning	1264	Out of range value adjusted for column 'ulong' at row 1
-Warning	1264	Out of range value adjusted for column 'ulonglong' at row 1
+Warning	1264	Out of range value for column 'utiny' at row 1
+Warning	1264	Out of range value for column 'ushort' at row 1
+Warning	1264	Out of range value for column 'umedium' at row 1
+Warning	1264	Out of range value for column 'ulong' at row 1
+Warning	1264	Out of range value for column 'ulonglong' at row 1
 Warning	1265	Data truncated for column 'options' at row 1
 Warning	1265	Data truncated for column 'flags' at row 1
 insert into t1 values (0,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,NULL,0,0,0,-4294967295,-4294967295,-4294967295,'-4294967295',0,"one,two,tree");
 Warnings:
 Warning	1265	Data truncated for column 'string' at row 1
-Warning	1264	Out of range value adjusted for column 'tiny' at row 1
-Warning	1264	Out of range value adjusted for column 'short' at row 1
-Warning	1264	Out of range value adjusted for column 'medium' at row 1
-Warning	1264	Out of range value adjusted for column 'long_int' at row 1
-Warning	1264	Out of range value adjusted for column 'utiny' at row 1
-Warning	1264	Out of range value adjusted for column 'ushort' at row 1
-Warning	1264	Out of range value adjusted for column 'umedium' at row 1
-Warning	1264	Out of range value adjusted for column 'ulong' at row 1
-Warning	1264	Out of range value adjusted for column 'ulonglong' at row 1
+Warning	1264	Out of range value for column 'tiny' at row 1
+Warning	1264	Out of range value for column 'short' at row 1
+Warning	1264	Out of range value for column 'medium' at row 1
+Warning	1264	Out of range value for column 'long_int' at row 1
+Warning	1264	Out of range value for column 'utiny' at row 1
+Warning	1264	Out of range value for column 'ushort' at row 1
+Warning	1264	Out of range value for column 'umedium' at row 1
+Warning	1264	Out of range value for column 'ulong' at row 1
+Warning	1264	Out of range value for column 'ulonglong' at row 1
 Warning	1265	Data truncated for column 'options' at row 1
 insert into t1 values (0,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,NULL,0,0,0,4294967295,4294967295,4294967295,'4294967295',0,0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'tiny' at row 1
-Warning	1264	Out of range value adjusted for column 'short' at row 1
-Warning	1264	Out of range value adjusted for column 'medium' at row 1
-Warning	1264	Out of range value adjusted for column 'long_int' at row 1
-Warning	1264	Out of range value adjusted for column 'utiny' at row 1
-Warning	1264	Out of range value adjusted for column 'ushort' at row 1
-Warning	1264	Out of range value adjusted for column 'umedium' at row 1
+Warning	1264	Out of range value for column 'tiny' at row 1
+Warning	1264	Out of range value for column 'short' at row 1
+Warning	1264	Out of range value for column 'medium' at row 1
+Warning	1264	Out of range value for column 'long_int' at row 1
+Warning	1264	Out of range value for column 'utiny' at row 1
+Warning	1264	Out of range value for column 'ushort' at row 1
+Warning	1264	Out of range value for column 'umedium' at row 1
 Warning	1265	Data truncated for column 'options' at row 1
 insert into t1 (tiny) values (1);
 select auto,string,tiny,short,medium,long_int,longlong,real_float,real_double,utiny,ushort,umedium,ulong,ulonglong,mod(floor(time_stamp/1000000),1000000)-mod(curdate(),1000000),date_field,time_field,date_time,blob_col,tinyblob_col,mediumblob_col,longblob_col from t1;

--- 1.13/mysql-test/r/type_time.result	Tue Sep 28 22:07:51 2004
+++ 1.14/mysql-test/r/type_time.result	Fri Dec  2 15:01:37 2005
@@ -26,9 +26,9 @@ t
 insert into t1 values("10.22.22"),(1234567),(123456789),(123456789.10),("10 22:22"),("12.45a");
 Warnings:
 Warning	1265	Data truncated for column 't' at row 1
-Warning	1264	Out of range value adjusted for column 't' at row 2
-Warning	1264	Out of range value adjusted for column 't' at row 3
-Warning	1264	Out of range value adjusted for column 't' at row 4
+Warning	1264	Out of range value for column 't' at row 2
+Warning	1264	Out of range value for column 't' at row 3
+Warning	1264	Out of range value for column 't' at row 4
 Warning	1265	Data truncated for column 't' at row 6
 select * from t1;
 t

--- 1.11/mysql-test/r/type_uint.result	Tue Sep 28 22:07:51 2004
+++ 1.12/mysql-test/r/type_uint.result	Fri Dec  2 15:01:37 2005
@@ -4,10 +4,10 @@ create table t1 (this int unsigned);
 insert into t1 values (1);
 insert into t1 values (-1);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'this' at row 1
+Warning	1264	Out of range value for column 'this' at row 1
 insert into t1 values ('5000000000');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'this' at row 1
+Warning	1264	Out of range value for column 'this' at row 1
 select * from t1;
 this
 1

--- 1.26/mysql-test/r/strict.result	Thu Dec  1 15:30:05 2005
+++ 1.27/mysql-test/r/strict.result	Fri Dec  2 15:01:37 2005
@@ -260,14 +260,14 @@ ERROR 22007: Incorrect date value: '2004
 INSERT INTO t1 (col1) VALUES(CAST('2004-0-10' AS DATE));
 ERROR 22007: Incorrect date value: '2004-00-10' for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(CAST('0000-00-00' AS DATE));
-ERROR 22007: Truncated incorrect datetime value: '0000-00-00'
+ERROR 22007: Incorrect datetime value: '0000-00-00'
 INSERT INTO t1 (col2) VALUES(CAST('0000-10-31 15:30' AS DATETIME));
 INSERT INTO t1 (col2) VALUES(CAST('2004-10-0 15:30' AS DATETIME));
 ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
 ERROR 22007: Incorrect datetime value: '2004-00-10 15:30:00' for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(CAST('0000-00-00' AS DATETIME));
-ERROR 22007: Truncated incorrect datetime value: '0000-00-00'
+ERROR 22007: Incorrect datetime value: '0000-00-00'
 INSERT INTO t1 (col3) VALUES(CAST('0000-10-31 15:30' AS DATETIME));
 ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1
 INSERT INTO t1 (col3) VALUES(CAST('2004-10-0 15:30' AS DATETIME));
@@ -275,7 +275,7 @@ ERROR 22007: Incorrect datetime value: '
 INSERT INTO t1 (col3) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
 ERROR 22007: Incorrect datetime value: '2004-00-10 15:30:00' for column 'col3' at row 1
 INSERT INTO t1 (col3) VALUES(CAST('0000-00-00' AS DATETIME));
-ERROR 22007: Truncated incorrect datetime value: '0000-00-00'
+ERROR 22007: Incorrect datetime value: '0000-00-00'
 drop table t1;
 CREATE TABLE t1 (col1 date, col2 datetime, col3 timestamp);
 INSERT INTO t1 (col1) VALUES (CONVERT('2004-10-15',DATE));
@@ -287,14 +287,14 @@ ERROR 22007: Incorrect date value: '2004
 INSERT INTO t1 (col1) VALUES(CONVERT('2004-0-10' , DATE));
 ERROR 22007: Incorrect date value: '2004-00-10' for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(CONVERT('0000-00-00',DATE));
-ERROR 22007: Truncated incorrect datetime value: '0000-00-00'
+ERROR 22007: Incorrect datetime value: '0000-00-00'
 INSERT INTO t1 (col2) VALUES(CONVERT('0000-10-31 15:30',DATETIME));
 INSERT INTO t1 (col2) VALUES(CONVERT('2004-10-0 15:30',DATETIME));
 ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(CONVERT('2004-0-10 15:30',DATETIME));
 ERROR 22007: Incorrect datetime value: '2004-00-10 15:30:00' for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(CONVERT('0000-00-00',DATETIME));
-ERROR 22007: Truncated incorrect datetime value: '0000-00-00'
+ERROR 22007: Incorrect datetime value: '0000-00-00'
 INSERT INTO t1 (col3) VALUES(CONVERT('0000-10-31 15:30',DATETIME));
 ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1
 INSERT INTO t1 (col3) VALUES(CONVERT('2004-10-0 15:30',DATETIME));
@@ -302,7 +302,7 @@ ERROR 22007: Incorrect datetime value: '
 INSERT INTO t1 (col3) VALUES(CONVERT('2004-0-10 15:30',DATETIME));
 ERROR 22007: Incorrect datetime value: '2004-00-10 15:30:00' for column 'col3' at row 1
 INSERT INTO t1 (col3) VALUES(CONVERT('0000-00-00',DATETIME));
-ERROR 22007: Truncated incorrect datetime value: '0000-00-00'
+ERROR 22007: Incorrect datetime value: '0000-00-00'
 drop table t1;
 CREATE TABLE t1(col1 TINYINT, col2 TINYINT UNSIGNED);
 INSERT INTO t1 VALUES(-128,0),(0,0),(127,255),('-128','0'),('0','0'),('127','255'),(-128.0,0.0),(0.0,0.0),(127.0,255.0);
@@ -314,36 +314,36 @@ Warnings:
 Error	1365	Division by 0
 Error	1365	Division by 0
 INSERT INTO t1 (col1) VALUES(-129);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(128);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(256);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES('-129');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES('128');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES('-1');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES('256');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES(128.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(256.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 SELECT MOD(col1,0) FROM t1 WHERE col1 > 0 LIMIT 1;
 MOD(col1,0)
 NULL
 Warnings:
 Error	1365	Division by 0
 UPDATE t1 SET col1 = col1 - 50 WHERE col1 < 0;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 UPDATE t1 SET col2=col2 + 50 WHERE col2 > 0;
-ERROR 22003: Out of range value adjusted for column 'col2' at row 3
+ERROR 22003: Out of range value for column 'col2' at row 3
 UPDATE t1 SET col1=col1 / 0 WHERE col1 > 0;
 ERROR 22012: Division by 0
 set @@sql_mode='ERROR_FOR_DIVISION_BY_ZERO';
@@ -377,16 +377,16 @@ INSERT INTO t1 values (1/0,1/0);
 set @@sql_mode='ansi,traditional';
 INSERT IGNORE INTO t1 VALUES('-129','-1'),('128','256');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 VALUES(-129.0,-1.0),(128.0,256.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 UPDATE IGNORE t1 SET col2=1/NULL where col1=0;
 SELECT * FROM t1;
 col1	col2
@@ -411,33 +411,33 @@ DROP TABLE t1;
 CREATE TABLE t1(col1 SMALLINT, col2 SMALLINT UNSIGNED);
 INSERT INTO t1 VALUES(-32768,0),(0,0),(32767,65535),('-32768','0'),('32767','65535'),(-32768.0,0.0),(32767.0,65535.0);
 INSERT INTO t1 (col1) VALUES(-32769);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(32768);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(65536);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES('-32769');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES('32768');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES('-1');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES('65536');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES(-32769.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(32768.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(65536.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 UPDATE t1 SET col1 = col1 - 50 WHERE col1 < 0;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 UPDATE t1 SET col2 = col2 + 50 WHERE col2 > 0;
-ERROR 22003: Out of range value adjusted for column 'col2' at row 3
+ERROR 22003: Out of range value for column 'col2' at row 3
 UPDATE t1 SET col1 = col1 / 0 WHERE col1 > 0;
 ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
@@ -457,22 +457,22 @@ Error	1365	Division by 0
 Error	1365	Division by 0
 INSERT IGNORE INTO t1 VALUES(-32769,-1),(32768,65536);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 VALUES('-32769','-1'),('32768','65536');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 VALUES(-32769,-1.0),(32768.0,65536.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 UPDATE IGNORE t1 SET col2=1/NULL where col1=0;
 SELECT * FROM t1;
 col1	col2
@@ -495,33 +495,33 @@ DROP TABLE t1;
 CREATE TABLE t1 (col1 MEDIUMINT, col2 MEDIUMINT UNSIGNED);
 INSERT INTO t1 VALUES(-8388608,0),(0,0),(8388607,16777215),('-8388608','0'),('8388607','16777215'),(-8388608.0,0.0),(8388607.0,16777215.0);
 INSERT INTO t1 (col1) VALUES(-8388609);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(8388608);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(16777216);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES('-8388609');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES('8388608');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES('-1');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES('16777216');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES(-8388609.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(8388608.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(16777216.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 UPDATE t1 SET col1 = col1 - 50 WHERE col1 < 0;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 UPDATE t1 SET col2 = col2 + 50 WHERE col2 > 0;
-ERROR 22003: Out of range value adjusted for column 'col2' at row 3
+ERROR 22003: Out of range value for column 'col2' at row 3
 UPDATE t1 SET col1 =col1 / 0 WHERE col1 > 0;
 ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
@@ -541,22 +541,22 @@ Error	1365	Division by 0
 Error	1365	Division by 0
 INSERT IGNORE INTO t1 VALUES(-8388609,-1),(8388608,16777216);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 VALUES('-8388609','-1'),('8388608','16777216');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 VALUES(-8388609.0,-1.0),(8388608.0,16777216.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 UPDATE IGNORE t1 SET col2=1/NULL where col1=0;
 SELECT * FROM t1;
 col1	col2
@@ -579,41 +579,41 @@ DROP TABLE t1;
 CREATE TABLE t1 (col1 INT, col2 INT UNSIGNED);
 INSERT INTO t1 VALUES(-2147483648,0),(0,0),(2147483647,4294967295),('-2147483648','0'),('2147483647','4294967295'),(-2147483648.0,0.0),(2147483647.0,4294967295.0);
 INSERT INTO t1 (col1) VALUES(-2147483649);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(2147643648);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(4294967296);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES('-2147483649');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES('2147643648');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES('-1');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES('4294967296');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES(-2147483649.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(2147643648.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(4294967296.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 UPDATE t1 SET col1 = col1 - 50 WHERE col1 < 0;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 UPDATE t1 SET col2 =col2 + 50 WHERE col2 > 0;
-ERROR 22003: Out of range value adjusted for column 'col2' at row 3
+ERROR 22003: Out of range value for column 'col2' at row 3
 UPDATE t1 SET col1 =col1 / 0 WHERE col1 > 0;
 ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -625,22 +625,22 @@ Error	1365	Division by 0
 Error	1365	Division by 0
 INSERT IGNORE INTO t1 values (-2147483649, -1),(2147643648,4294967296);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 values ('-2147483649', '-1'),('2147643648','4294967296');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 values (-2147483649.0, -1.0),(2147643648.0,4294967296.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 UPDATE IGNORE t1 SET col2=1/NULL where col1=0;
 SELECT * FROM t1;
 col1	col2
@@ -665,37 +665,37 @@ INSERT INTO t1 VALUES(-92233720368547758
 INSERT INTO t1 VALUES('-9223372036854775808','0'),('9223372036854775807','18446744073709551615');
 INSERT INTO t1 VALUES(-9223372036854774000.0,0.0),(9223372036854775700.0,1844674407370954000.0);
 INSERT INTO t1 (col1) VALUES(-9223372036854775809);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(9223372036854775808);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(18446744073709551616);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES('-9223372036854775809');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES('9223372036854775808');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES('-1');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES('18446744073709551616');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES(-9223372036854785809.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES(9223372036854785808.0);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES(-1.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES(18446744073709551616.0);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 UPDATE t1 SET col1 =col1 / 0 WHERE col1 > 0;
 ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -707,22 +707,22 @@ Error	1365	Division by 0
 Error	1365	Division by 0
 INSERT IGNORE INTO t1 VALUES(-9223372036854775809,-1),(9223372036854775808,18446744073709551616);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 VALUES('-9223372036854775809','-1'),('9223372036854775808','18446744073709551616');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 INSERT IGNORE INTO t1 VALUES(-9223372036854785809.0,-1.0),(9223372036854785808.0,18446744073709551616.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
-Warning	1264	Out of range value adjusted for column 'col2' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col2' at row 2
 UPDATE IGNORE t1 SET col2=1/NULL where col1=0;
 SELECT * FROM t1;
 col1	col2
@@ -752,29 +752,29 @@ Warnings:
 Note	1265	Data truncated for column 'col1' at row 2
 Note	1265	Data truncated for column 'col1' at row 4
 INSERT INTO t1 VALUES (101.55);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES (101);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES (-101.55);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES (1010.55);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES (1010);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES ('101.55');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES ('101');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES ('-101.55');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES ('-1010.55');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES ('-100E+1');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES ('-100E');
 ERROR HY000: Incorrect decimal value: '-100E' for column 'col1' at row 1
 UPDATE t1 SET col1 =col1 * 50000 WHERE col1 =11;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 6
+ERROR 22003: Out of range value for column 'col1' at row 6
 UPDATE t1 SET col1 =col1 / 0 WHERE col1 > 0;
 ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
@@ -793,16 +793,16 @@ Warnings:
 Error	1365	Division by 0
 INSERT IGNORE INTO t1 VALUES(1000),(-1000);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
 INSERT IGNORE INTO t1 VALUES('1000'),('-1000');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
 INSERT IGNORE INTO t1 VALUES(1000.0),(-1000.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
 UPDATE IGNORE t1 SET col1=1/NULL where col1=0;
 SELECT * FROM t1;
 col1
@@ -833,15 +833,15 @@ INSERT INTO t1 VALUES (-1.1E-37,0),(+3.4
 INSERT INTO t1 VALUES ('-1.1E-37',0),('+3.4E+38','+3.4E+38');
 INSERT INTO t1 (col1) VALUES (3E-46);
 INSERT INTO t1 (col1) VALUES (+3.4E+39);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES (-1.1E-3);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES ('+3.4E+39');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES ('-1.1E-3');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 UPDATE t1 SET col1 =col1 * 5000 WHERE col1 > 0;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 2
+ERROR 22003: Out of range value for column 'col1' at row 2
 UPDATE t1 SET col2 =col2 / 0 WHERE col2 > 0;
 ERROR 22012: Division by 0
 UPDATE t1 SET col2= MOD(col2,0) WHERE col2 > 0;
@@ -860,12 +860,12 @@ Warnings:
 Error	1365	Division by 0
 INSERT IGNORE INTO t1 VALUES (+3.4E+39,-3.4E+39);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
 INSERT IGNORE INTO t1 VALUES ('+3.4E+39','-3.4E+39');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
 SELECT * FROM t1;
 col1	col2
 -1.1e-37	0
@@ -885,13 +885,13 @@ INSERT INTO t1 (col1) VALUES (-2.2E-330)
 INSERT INTO t1 (col1) VALUES (+1.7E+309);
 Got one of the listed errors
 INSERT INTO t1 (col2) VALUES (-1.1E-3);
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 INSERT INTO t1 (col1) VALUES ('+1.8E+309');
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES ('-1.2E-3');
-ERROR 22003: Out of range value adjusted for column 'col2' at row 1
+ERROR 22003: Out of range value for column 'col2' at row 1
 UPDATE t1 SET col1 =col1 * 5000 WHERE col1 > 0;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 3
+ERROR 22003: Out of range value for column 'col1' at row 3
 UPDATE t1 SET col2 =col2 / 0 WHERE col2 > 0;
 ERROR 22012: Division by 0
 UPDATE t1 SET col2= MOD(col2,0) WHERE col2 > 0;
@@ -912,9 +912,9 @@ INSERT IGNORE INTO t1 VALUES (+1.9E+309,
 ERROR 22007: Illegal double '1.9E+309' value found during parsing
 INSERT IGNORE INTO t1 VALUES ('+2.0E+309','-2.0E+309');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
 SELECT * FROM t1;
 col1	col2
 0	0
@@ -1133,19 +1133,19 @@ ERROR 22007: Incorrect date value: '0' f
 insert into t1 values (0.0,0.0,0.0);
 ERROR 22007: Incorrect date value: '0' for column 'col1' at row 1
 insert into t1 (col1) values (convert('0000-00-00',date));
-ERROR 22007: Truncated incorrect datetime value: '0000-00-00'
+ERROR 22007: Incorrect datetime value: '0000-00-00'
 insert into t1 (col1) values (cast('0000-00-00' as date));
-ERROR 22007: Truncated incorrect datetime value: '0000-00-00'
+ERROR 22007: Incorrect datetime value: '0000-00-00'
 set sql_mode='no_zero_date';
 insert into t1 values (0,0,0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
 Warning	1265	Data truncated for column 'col3' at row 1
 insert into t1 values (0.0,0.0,0.0);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col2' at row 1
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col2' at row 1
 Warning	1265	Data truncated for column 'col3' at row 1
 drop table t1;
 set sql_mode='traditional';
@@ -1160,15 +1160,15 @@ Warnings:
 Warning	1265	Data truncated for column 'col1' at row 1
 insert ignore into t1 (col1) values (cast('0000-00-00' as date));
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00'
+Warning	1292	Incorrect datetime value: '0000-00-00'
 insert into t1 select * from t1;
 ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
 alter table t1 modify col1 datetime;
 ERROR 22007: Incorrect datetime value: '0000-00-00' for column 'col1' at row 1
 alter ignore table t1 modify col1 datetime;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'col1' at row 1
-Warning	1264	Out of range value adjusted for column 'col1' at row 2
+Warning	1264	Out of range value for column 'col1' at row 1
+Warning	1264	Out of range value for column 'col1' at row 2
 insert into t1 select * from t1;
 ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'col1' at row 1
 select * from t1;

--- 1.20/mysql-test/r/loaddata.result	Thu Oct 27 02:11:06 2005
+++ 1.21/mysql-test/r/loaddata.result	Fri Dec  2 15:01:36 2005
@@ -43,9 +43,9 @@ drop table t1;
 create table t1 (a int, b char(10));
 load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 Warning	1262	Row 3 was truncated; it contained more data than there were input columns
-Warning	1264	Out of range value adjusted for column 'a' at row 5
+Warning	1264	Out of range value for column 'a' at row 5
 Warning	1262	Row 5 was truncated; it contained more data than there were input columns
 select * from t1;
 a	b
@@ -57,7 +57,7 @@ a	b
 truncate table t1;
 load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 Warning	1261	Row 4 doesn't contain data for all columns
 select * from t1;
 a	b

--- 1.109/mysql-test/r/func_str.result	Wed Oct 12 02:58:17 2005
+++ 1.110/mysql-test/r/func_str.result	Fri Dec  2 15:01:36 2005
@@ -837,16 +837,16 @@ drop table t1, t2;
 create table t1 (c1 INT, c2 INT UNSIGNED);
 insert into t1 values ('21474836461','21474836461');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
 insert into t1 values ('-21474836461','-21474836461');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
 show warnings;
 Level	Code	Message
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
 select * from t1;
 c1	c2
 2147483647	4294967295

--- 1.172/mysql-test/r/sp.result	Thu Dec  1 14:26:27 2005
+++ 1.173/mysql-test/r/sp.result	Fri Dec  2 15:01:37 2005
@@ -1674,7 +1674,7 @@ drop procedure bug2776_2|
 create table t3 (s1 smallint)|
 insert into t3 values (123456789012)|
 Warnings:
-Warning	1264	Out of range value adjusted for column 's1' at row 1
+Warning	1264	Out of range value for column 's1' at row 1
 drop procedure if exists bug2780|
 create procedure bug2780()
 begin

--- 1.86/mysql-test/r/mysqldump.result	Fri Dec  2 03:14:47 2005
+++ 1.87/mysql-test/r/mysqldump.result	Fri Dec  2 15:01:36 2005
@@ -33,7 +33,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (a double);
 INSERT INTO t1 VALUES ('-9e999999');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 CREATE TABLE `t1` (
   `a` double default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;

--- 1.14/mysql-test/r/type_bit.result	Thu Sep 22 05:23:04 2005
+++ 1.15/mysql-test/r/type_bit.result	Fri Dec  2 15:01:37 2005
@@ -62,7 +62,7 @@ drop table t1;
 create table t1 (a bit);
 insert into t1 values (b'0'), (b'1'), (b'000'), (b'100'), (b'001');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 select hex(a) from t1;
 hex(a)
 0
@@ -76,7 +76,7 @@ drop table t1;
 create table t1 (a bit(2));
 insert into t1 values (b'00'), (b'01'), (b'10'), (b'100');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 select a+0 from t1;
 a+0
 0
@@ -461,7 +461,7 @@ drop table t1;
 create table t1 (a bit(8)) engine=heap;
 insert into t1 values ('1111100000');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select a+0 from t1;
 a+0
 255

--- 1.3/mysql-test/r/type_bit_innodb.result	Sat Aug  6 05:22:48 2005
+++ 1.4/mysql-test/r/type_bit_innodb.result	Fri Dec  2 15:01:37 2005
@@ -62,7 +62,7 @@ drop table t1;
 create table t1 (a bit) engine=innodb;
 insert into t1 values (b'0'), (b'1'), (b'000'), (b'100'), (b'001');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 select hex(a) from t1;
 hex(a)
 0
@@ -76,7 +76,7 @@ drop table t1;
 create table t1 (a bit(2)) engine=innodb;
 insert into t1 values (b'00'), (b'01'), (b'10'), (b'100');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 4
 select a+0 from t1;
 a+0
 0

--- 1.36/mysql-test/r/warnings.result	Thu Dec  1 15:30:05 2005
+++ 1.37/mysql-test/r/warnings.result	Fri Dec  2 15:01:38 2005
@@ -31,19 +31,19 @@ Error	1064	You have an error in your SQL
 insert into t1 values (1);
 insert into t1 values ("hej");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
 set SQL_WARNINGS=1;
 insert into t1 values ("hej");
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
 drop table t1;
 set SQL_WARNINGS=0;
 drop temporary table if exists not_exists;
@@ -78,7 +78,7 @@ Warning	1265	Data truncated for column '
 Warning	1261	Row 5 doesn't contain data for all columns
 Warning	1265	Data truncated for column 'b' at row 6
 Warning	1262	Row 7 was truncated; it contained more data than there were input columns
-Warning	1264	Out of range value adjusted for column 'a' at row 8
+Warning	1264	Out of range value for column 'a' at row 8
 select @@warning_count;
 @@warning_count
 7
@@ -87,10 +87,10 @@ create table t1(a tinyint NOT NULL, b ti
 insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test');
 Warnings:
 Warning	1048	Column 'a' cannot be null
-Warning	1264	Out of range value adjusted for column 'b' at row 2
+Warning	1264	Out of range value for column 'b' at row 2
 Warning	1265	Data truncated for column 'c' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
-Warning	1264	Out of range value adjusted for column 'b' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
+Warning	1264	Out of range value for column 'b' at row 3
 Warning	1265	Data truncated for column 'c' at row 3
 alter table t1 modify c char(4);
 Warnings:
@@ -180,44 +180,44 @@ create table t1 (a int);
 insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
 update t1 set a='abc';
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
-Warning	1264	Out of range value adjusted for column 'a' at row 4
-Warning	1264	Out of range value adjusted for column 'a' at row 5
-Warning	1264	Out of range value adjusted for column 'a' at row 6
-Warning	1264	Out of range value adjusted for column 'a' at row 7
-Warning	1264	Out of range value adjusted for column 'a' at row 8
-Warning	1264	Out of range value adjusted for column 'a' at row 9
-Warning	1264	Out of range value adjusted for column 'a' at row 10
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 5
+Warning	1264	Out of range value for column 'a' at row 6
+Warning	1264	Out of range value for column 'a' at row 7
+Warning	1264	Out of range value for column 'a' at row 8
+Warning	1264	Out of range value for column 'a' at row 9
+Warning	1264	Out of range value for column 'a' at row 10
 show warnings limit 2, 1;
 Level	Code	Message
-Warning	1264	Out of range value adjusted for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 3
 show warnings limit 0, 10;
 Level	Code	Message
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'a' at row 2
-Warning	1264	Out of range value adjusted for column 'a' at row 3
-Warning	1264	Out of range value adjusted for column 'a' at row 4
-Warning	1264	Out of range value adjusted for column 'a' at row 5
-Warning	1264	Out of range value adjusted for column 'a' at row 6
-Warning	1264	Out of range value adjusted for column 'a' at row 7
-Warning	1264	Out of range value adjusted for column 'a' at row 8
-Warning	1264	Out of range value adjusted for column 'a' at row 9
-Warning	1264	Out of range value adjusted for column 'a' at row 10
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'a' at row 3
+Warning	1264	Out of range value for column 'a' at row 4
+Warning	1264	Out of range value for column 'a' at row 5
+Warning	1264	Out of range value for column 'a' at row 6
+Warning	1264	Out of range value for column 'a' at row 7
+Warning	1264	Out of range value for column 'a' at row 8
+Warning	1264	Out of range value for column 'a' at row 9
+Warning	1264	Out of range value for column 'a' at row 10
 show warnings limit 9, 1;
 Level	Code	Message
-Warning	1264	Out of range value adjusted for column 'a' at row 10
+Warning	1264	Out of range value for column 'a' at row 10
 show warnings limit 10, 1;
 Level	Code	Message
 show warnings limit 9, 2;
 Level	Code	Message
-Warning	1264	Out of range value adjusted for column 'a' at row 10
+Warning	1264	Out of range value for column 'a' at row 10
 show warnings limit 0, 0;
 Level	Code	Message
 show warnings limit 1;
 Level	Code	Message
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 show warnings limit 0;
 Level	Code	Message
 show warnings limit 1, 0;
Thread
bk commit into 5.1 tree (gluh:1.2002) BUG#8294gluh2 Dec