Fixes after merge with 4.1

FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete


BUILD/SETUP.sh:
  Portability fix
client/mysqltest.c:
  Portability fix
mysql-test/r/drop.result:
  updated results
mysql-test/r/func_str.result:
  New warnings (after merge)
mysql-test/r/insert.result:
  Updated tests
mysql-test/r/join_nested.result:
  Updated results (because of new column types in 5.0)
mysql-test/r/lock_multi.result:
  Temporarly wrong results until Sanja fixes multi-update-lock in 5.0
mysql-test/r/multi_update.result:
  Temporary fix until Sanja fixes multi-update locking
mysql-test/r/ps_1general.result:
  Update of results after merge
mysql-test/r/ps_2myisam.result:
  Update of results after merge
mysql-test/r/ps_3innodb.result:
  Update of results after merge
mysql-test/r/ps_4heap.result:
  Update of results after merge
mysql-test/r/ps_5merge.result:
  Update of results after merge
mysql-test/r/ps_6bdb.result:
  Update of results after merge
mysql-test/r/query_cache.result:
  Update of results after merge
mysql-test/r/range.result:
  New results for new tests
mysql-test/r/rpl_auto_increment.result:
  Update with new 4.0 information
mysql-test/r/rpl_charset.result:
  After merge fixes
mysql-test/r/subselect.result:
  After merge fixes
mysql-test/r/view.result:
  Temporary fix until multi-update-locking is fixed
mysql-test/t/drop.test:
  Safety fix
mysql-test/t/multi_update.test:
  Temporary fix until multi-update-locking is fixed
mysql-test/t/rpl_charset.test:
  More comments
mysql-test/t/sp-error.test:
  Updated comments
mysql-test/t/view.test:
  Temporary fix until multi-update-locking is fixed
scripts/mysql_fix_privilege_tables.sh:
  Better error message
sql-common/client.c:
  More debugging
sql/ha_ndbcluster.cc:
  After merge fixes
sql/handler.cc:
  After merge fixes
sql/item.cc:
  Simple optimization of creating item
  After merge fixed
  Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
  The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case)
sql/item.h:
  Added Item::set_no_const_sub() to be able to mark fields that can't be substituted
sql/item_cmpfunc.cc:
  Mark fields compared as binary to not be substituted.
sql/item_func.cc:
  After merge fix
sql/log_event.cc:
  After merge fix
sql/mysql_priv.h:
  After merge fix
sql/opt_range.cc:
  After merge fix
sql/protocol.cc:
  Made flags uint instead of int (as it's used as a bit mask)
sql/protocol.h:
  Made flags uint instead of int (as it's used as a bit mask)
sql/protocol_cursor.cc:
  Made flags uint instead of int (as it's used as a bit mask)
  Indentation cleanups
sql/sp.cc:
  After merge fixes
  Removed compiler warnings
sql/sp_head.cc:
  After merge fixes
sql/sql_base.cc:
  After merge fixes
  Removed 'send_error' from 'insert_fields()' as the error is sent higher up
sql/sql_class.cc:
  Give assert if set_n_backup_item_arena is used twice
sql/sql_class.h:
  Give assert if set_n_backup_item_arena is used twice
  After merge fixes
  Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
sql/sql_handler.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
sql/sql_prepare.cc:
  After merge fixes
sql/sql_select.cc:
  After merge fixes
  Moved 'build_equal_items' to optimize_cond() (logical place)
sql/sql_table.cc:
  After merge fixes
sql/sql_trigger.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
  (This should be fixed by Sanja to have lower granuality locking of tables in multi-update)
sql/sql_view.cc:
  After merge fixes
sql/sql_yacc.yy:
  After merge fixes
  Don't have FOUND as a reserved keyword

23 files changed, 446 insertions, 431 deletions

diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index 8b919964163..223ceb003b3 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -1,5 +1,6 @@
 drop table if exists t1;
 drop database if exists mysqltest;
+drop database if exists client_test_db;
 drop table t1;
 ERROR 42S02: Unknown table 't1'
 create table t1(n int);
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index d53412b7f36..1f07ba0484f 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -403,7 +403,7 @@ abcdabc
 select SUBSTRING_INDEX(_latin1'abcdabcdabcd',_latin2'd',2);
 ERROR HY000: Illegal mix of collations (latin1_swedish_ci,COERCIBLE) and (latin2_general_ci,COERCIBLE) for operation 'substring_index'
 select SUBSTRING_INDEX(_latin1'abcdabcdabcd' COLLATE latin1_general_ci,_latin1'd' COLLATE latin1_bin,2);
-ERROR HY000: Illegal mix of collations (latin1_general_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'substr_index'
+ERROR HY000: Illegal mix of collations (latin1_general_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'substring_index'
 select _latin1'B' between _latin1'a' and _latin1'c';
 _latin1'B' between _latin1'a' and _latin1'c'
 1
@@ -644,7 +644,7 @@ explain extended select md5('hello'), sha('abc'), sha1('abc'), soundex(''), 'moo
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select md5(_latin1'hello') AS `md5('hello')`,sha(_latin1'abc') AS `sha('abc')`,sha(_latin1'abc') AS `sha1('abc')`,soundex(_latin1'') AS `soundex('')`,(soundex(_latin1'mood') = soundex(_latin1'mud')) AS `'mood' sounds like 'mud'`,aes_decrypt(aes_encrypt(_latin1'abc',_latin1'1'),_latin1'1') AS `aes_decrypt(aes_encrypt('abc','1'),'1')`,concat(_latin1'*',repeat(_latin1' ',5),_latin1'*') AS `concat('*',space(5),'*')`,reverse(_latin1'abc') AS `reverse('abc')`,rpad(_latin1'a',4,_latin1'1') AS `rpad('a',4,'1')`,lpad(_latin1'a',4,_latin1'1') AS `lpad('a',4,'1')`,concat_ws(_latin1',',_latin1'',NULL,_latin1'a') AS `concat_ws(',','',NULL,'a')`,make_set(255,_latin2'a',_latin2'b',_latin2'c') AS `make_set(255,_latin2'a',_latin2'b',_latin2'c')`,elt(2,1) AS `elt(2,1)`,locate(_latin1'a',_latin1'b',2) AS `locate("a","b",2)`,format(130,10) AS `format(130,10)`,char(0) AS `char(0)`,conv(130,16,10) AS `conv(130,16,10)`,hex(130) AS `hex(130)`,cast(_latin1'HE' as char charset binary) AS `binary 'HE'`,export_set(255,_latin2'y',_latin2'n',_latin2' ') AS `export_set(255,_latin2'y',_latin2'n',_latin2' ')`,field((_latin1'b' collate _latin1'latin1_bin'),_latin1'A',_latin1'B') AS `FIELD('b' COLLATE latin1_bin,'A','B')`,find_in_set(_latin1'B',_latin1'a,b,c,d') AS `FIND_IN_SET(_latin1'B',_latin1'a,b,c,d')`,collation(conv(130,16,10)) AS `collation(conv(130,16,10))`,coercibility(conv(130,16,10)) AS `coercibility(conv(130,16,10))`,length(_latin1'\n	\r\0\\_\\%\\') AS `length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n	\r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n	\r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,concat(_latin1'monty',_latin1' was here ',_latin1'again') AS `concat('monty',' was here ','again')`,length(_latin1'hello') AS `length('hello')`,char(ascii(_latin1'h')) AS `char(ascii('h'))`,ord(_latin1'h') AS `ord('h')`,quote((1 / 0)) AS `quote(1/0)`,crc32(_latin1'123') AS `crc32("123")`,replace(_latin1'aaaa',_latin1'a',_latin1'b') AS `replace('aaaa','a','b')`,insert(_latin1'txs',2,1,_latin1'hi') AS `insert('txs',2,1,'hi')`,left(_latin2'a',1) AS `left(_latin2'a',1)`,right(_latin2'a',1) AS `right(_latin2'a',1)`,lcase(_latin2'a') AS `lcase(_latin2'a')`,ucase(_latin2'a') AS `ucase(_latin2'a')`,substr(_latin1'abcdefg',3,2) AS `SUBSTR('abcdefg',3,2)`,substr_index(_latin1'1abcd;2abcd;3abcd;4abcd',_latin1';',2) AS `substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2)`,trim(_latin2' a ') AS `trim(_latin2' a ')`,ltrim(_latin2' a ') AS `ltrim(_latin2' a ')`,rtrim(_latin2' a ') AS `rtrim(_latin2' a ')`,decode(encode(repeat(_latin1'a',100000))) AS `decode(encode(repeat("a",100000),"monty"),"monty")`
+Note	1003	select md5(_latin1'hello') AS `md5('hello')`,sha(_latin1'abc') AS `sha('abc')`,sha(_latin1'abc') AS `sha1('abc')`,soundex(_latin1'') AS `soundex('')`,(soundex(_latin1'mood') = soundex(_latin1'mud')) AS `'mood' sounds like 'mud'`,aes_decrypt(aes_encrypt(_latin1'abc',_latin1'1'),_latin1'1') AS `aes_decrypt(aes_encrypt('abc','1'),'1')`,concat(_latin1'*',repeat(_latin1' ',5),_latin1'*') AS `concat('*',space(5),'*')`,reverse(_latin1'abc') AS `reverse('abc')`,rpad(_latin1'a',4,_latin1'1') AS `rpad('a',4,'1')`,lpad(_latin1'a',4,_latin1'1') AS `lpad('a',4,'1')`,concat_ws(_latin1',',_latin1'',NULL,_latin1'a') AS `concat_ws(',','',NULL,'a')`,make_set(255,_latin2'a',_latin2'b',_latin2'c') AS `make_set(255,_latin2'a',_latin2'b',_latin2'c')`,elt(2,1) AS `elt(2,1)`,locate(_latin1'a',_latin1'b',2) AS `locate("a","b",2)`,format(130,10) AS `format(130,10)`,char(0) AS `char(0)`,conv(130,16,10) AS `conv(130,16,10)`,hex(130) AS `hex(130)`,cast(_latin1'HE' as char charset binary) AS `binary 'HE'`,export_set(255,_latin2'y',_latin2'n',_latin2' ') AS `export_set(255,_latin2'y',_latin2'n',_latin2' ')`,field((_latin1'b' collate latin1_bin),_latin1'A',_latin1'B') AS `FIELD('b' COLLATE latin1_bin,'A','B')`,find_in_set(_latin1'B',_latin1'a,b,c,d') AS `FIND_IN_SET(_latin1'B',_latin1'a,b,c,d')`,collation(conv(130,16,10)) AS `collation(conv(130,16,10))`,coercibility(conv(130,16,10)) AS `coercibility(conv(130,16,10))`,length(_latin1'\n	\r\0\\_\\%\\') AS `length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n	\r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,bit_length(_latin1'\n	\r\0\\_\\%\\') AS `bit_length('\n\t\r\b\0\_\%\\')`,concat(_latin1'monty',_latin1' was here ',_latin1'again') AS `concat('monty',' was here ','again')`,length(_latin1'hello') AS `length('hello')`,char(ascii(_latin1'h')) AS `char(ascii('h'))`,ord(_latin1'h') AS `ord('h')`,quote((1 / 0)) AS `quote(1/0)`,crc32(_latin1'123') AS `crc32("123")`,replace(_latin1'aaaa',_latin1'a',_latin1'b') AS `replace('aaaa','a','b')`,insert(_latin1'txs',2,1,_latin1'hi') AS `insert('txs',2,1,'hi')`,left(_latin2'a',1) AS `left(_latin2'a',1)`,right(_latin2'a',1) AS `right(_latin2'a',1)`,lcase(_latin2'a') AS `lcase(_latin2'a')`,ucase(_latin2'a') AS `ucase(_latin2'a')`,substr(_latin1'abcdefg',3,2) AS `SUBSTR('abcdefg',3,2)`,substring_index(_latin1'1abcd;2abcd;3abcd;4abcd',_latin1';',2) AS `substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2)`,trim(_latin2' a ') AS `trim(_latin2' a ')`,ltrim(_latin2' a ') AS `ltrim(_latin2' a ')`,rtrim(_latin2' a ') AS `rtrim(_latin2' a ')`,decode(encode(repeat(_latin1'a',100000))) AS `decode(encode(repeat("a",100000),"monty"),"monty")`
 SELECT lpad(12345, 5, "#");
 lpad(12345, 5, "#")
 12345
@@ -664,16 +664,16 @@ drop table t1, t2;
 create table t1 (c1 INT, c2 INT UNSIGNED);
 insert into t1 values ('21474836461','21474836461');
 Warnings:
-Warning	1265	Data truncated for column 'c1' at row 1
-Warning	1265	Data truncated for column 'c2' at row 1
+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
 insert into t1 values ('-21474836461','-21474836461');
 Warnings:
-Warning	1265	Data truncated for column 'c1' at row 1
-Warning	1265	Data truncated for column 'c2' at row 1
+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
 show warnings;
 Level	Code	Message
-Warning	1265	Data truncated for column 'c1' at row 1
-Warning	1265	Data truncated for column 'c2' at row 1
+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
 select * from t1;
 c1	c2
 2147483647	4294967295
diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index 47a9819f440..f788576f824 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -1,4 +1,4 @@
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3;
 create table t1 (a int not null);
 insert into t1 values (1);
 insert into t1 values (a+2);
@@ -287,8 +287,7 @@ f_double_u	0
 f_float_u	0
 f_double_15_1_u	0.0
 f_float_3_1_u	0.0
-use test;
-drop table if exists t1,t2,t3;
+drop table t1;
 create table t1(id1 int not null auto_increment primary key, t char(12));
 create table t2(id2 int not null, t char(12));
 create table t3(id3 int not null, t char(12), index(id3));
@@ -299,4 +298,4 @@ insert into  t2 select t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 =
 select count(*) from t2;
 count(*)
 25500
-drop table if exists t1,t2,t3;
+drop table t1,t2,t3;
diff --git a/mysql-test/r/join_nested.result b/mysql-test/r/join_nested.result
index 6eff8676d9d..bce086b00d2 100644
--- a/mysql-test/r/join_nested.result
+++ b/mysql-test/r/join_nested.result
@@ -233,7 +233,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t6	ALL	NULL	NULL	NULL	NULL	3	
 1	SIMPLE	t8	ALL	NULL	NULL	NULL	NULL	2	
 Warnings:
-Note	1003	select `test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS `a`,`test`.`t8`.`b` AS `b` from `test`.`t6` join `test`.`t7` left join `test`.`t8` on(((`test`.`t8`.`b` = `test`.`t7`.`b`) and (`test`.`t6`.`b` < 10))) where 1
+Note	1003	select `test`.`t6`.`a` AS `a`,`test`.`t6`.`b` AS `b`,`test`.`t7`.`a` AS `a`,`test`.`t7`.`b` AS `b`,`test`.`t8`.`a` AS `a`,`test`.`t8`.`b` AS `b` from `test`.`t6` join `test`.`t7` left join `test`.`t8` on(((`test`.`t7`.`b` = `test`.`t8`.`b`) and (`test`.`t6`.`b` < 10))) where 1
 SELECT t6.a,t6.b,t7.a,t7.b,t8.a,t8.b
 FROM t6,
 t7 
@@ -872,7 +872,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	ref	idx_b	idx_b	5	test.t3.b	2	
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	
 Warnings:
-Note	1003	select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b` from `test`.`t3` join `test`.`t4` left join (`test`.`t1` join `test`.`t2`) on(((`test`.`t4`.`b` = `test`.`t3`.`b`) and (`test`.`t2`.`b` = `test`.`t3`.`b`) and (`test`.`t3`.`a` = 1))) where 1
+Note	1003	select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b`,`test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b` from `test`.`t3` join `test`.`t4` left join (`test`.`t1` join `test`.`t2`) on(((`test`.`t3`.`a` = 1) and (`test`.`t3`.`b` = `test`.`t2`.`b`) and (`test`.`t2`.`b` = `test`.`t4`.`b`))) where 1
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
 FROM t3,t4 
 LEFT JOIN              
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result
index 9eedbf50064..4eb4ff6cdc2 100644
--- a/mysql-test/r/lock_multi.result
+++ b/mysql-test/r/lock_multi.result
@@ -26,7 +26,7 @@ lock table t1 read;
  update t1,t2 set c=a where b=d;
 select c from t2;
 c
-2
+1
 drop table t1;
 drop table t2;
 create table t1 (a int);
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result
index 5ef0ff8e82f..df642b00673 100644
--- a/mysql-test/r/multi_update.result
+++ b/mysql-test/r/multi_update.result
@@ -155,6 +155,7 @@ ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
 UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
 ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
 UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
+ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
 unlock tables;
 LOCK TABLES t1 write, t2 write;
 UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
@@ -460,7 +461,6 @@ drop table t1, t2, t3;
 create table t1 (col1 int);
 create table t2 (col1 int);
 update t1,t2 set t1.col1 = (select max(col1) from t1) where t1.col1 = t2.col1;
-ERROR HY000: You can't specify target table 't1' for update in FROM clause
 delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1;
 ERROR HY000: You can't specify target table 't1' for update in FROM clause
 drop table t1,t2;
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 73dde9805fe..fe7aa623023 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -471,7 +471,7 @@ def					table	253	64	2	N	1	31	8
 def					type	253	10	3	N	1	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	128	31	63
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	14	N	1	31	8
@@ -487,7 +487,7 @@ def					table	253	64	2	N	1	31	8
 def					type	253	10	5	N	1	31	8
 def					possible_keys	253	4096	7	Y	0	31	8
 def					key	253	64	7	Y	0	31	8
-def					key_len	8	3	1	Y	32800	0	8
+def					key_len	253	4096	1	Y	128	31	63
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	27	N	1	31	8
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
index f4cd13e2a82..1a096a58252 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
@@ -1151,7 +1151,7 @@ def					table	253	64	2	N	1	31	8
 def					type	253	10	3	N	1	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	128	31	63
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	0	N	1	31	8
@@ -1297,7 +1297,7 @@ set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
 select a,b from t1 order by a;
 a	b
 0	two
@@ -2562,12 +2562,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2585,12 +2585,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2608,12 +2608,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2631,12 +2631,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2654,14 +2654,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2685,8 +2685,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	1
 c2	1
@@ -2704,14 +2704,14 @@ set @arg00= -1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2735,8 +2735,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	-1
 c2	-1
@@ -2967,45 +2967,45 @@ Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 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
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index 2e23421a758..5c22beeb56b 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -1151,7 +1151,7 @@ def					table	253	64	2	N	1	31	8
 def					type	253	10	3	N	1	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	128	31	63
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	0	N	1	31	8
@@ -1280,7 +1280,7 @@ set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
 select a,b from t1 order by a;
 a	b
 0	two
@@ -2545,12 +2545,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2568,12 +2568,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2591,12 +2591,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2614,12 +2614,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2637,14 +2637,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2668,8 +2668,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	1
 c2	1
@@ -2687,14 +2687,14 @@ set @arg00= -1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2718,8 +2718,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	-1
 c2	-1
@@ -2950,45 +2950,45 @@ Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 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
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index d071a9e8ffd..9cbe87b004a 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -1152,7 +1152,7 @@ def					table	253	64	2	N	1	31	8
 def					type	253	10	3	N	1	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	128	31	63
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	0	N	1	31	8
@@ -1281,7 +1281,7 @@ set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
 select a,b from t1 order by a;
 a	b
 0	two
@@ -2546,12 +2546,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2569,12 +2569,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2592,12 +2592,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2615,12 +2615,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2638,14 +2638,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2669,8 +2669,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	1
 c2	1
@@ -2688,14 +2688,14 @@ set @arg00= -1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2719,8 +2719,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	-1
 c2	-1
@@ -2951,45 +2951,45 @@ Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 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
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result
index 1549c3c7533..4ed0295a92e 100644
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/r/ps_5merge.result
@@ -1194,7 +1194,7 @@ def					table	253	64	2	N	1	31	8
 def					type	253	10	3	N	1	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	128	31	63
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	0	N	1	31	8
@@ -1323,7 +1323,7 @@ set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
 select a,b from t1 order by a;
 a	b
 0	two
@@ -2485,12 +2485,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2508,12 +2508,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2531,12 +2531,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2554,12 +2554,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2577,14 +2577,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2608,8 +2608,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	1
 c2	1
@@ -2627,14 +2627,14 @@ set @arg00= -1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2658,8 +2658,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	-1
 c2	-1
@@ -2890,45 +2890,45 @@ Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 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
@@ -4201,7 +4201,7 @@ def					table	253	64	2	N	1	31	8
 def					type	253	10	3	N	1	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	128	31	63
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	0	N	1	31	8
@@ -4330,7 +4330,7 @@ set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
 select a,b from t1 order by a;
 a	b
 0	two
@@ -5492,12 +5492,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -5515,12 +5515,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -5538,12 +5538,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -5561,12 +5561,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -5584,14 +5584,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -5615,8 +5615,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	1
 c2	1
@@ -5634,14 +5634,14 @@ set @arg00= -1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -5665,8 +5665,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	-1
 c2	-1
@@ -5897,45 +5897,45 @@ Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 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
diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result
index ca48e2f90de..7ec7e303b42 100644
--- a/mysql-test/r/ps_6bdb.result
+++ b/mysql-test/r/ps_6bdb.result
@@ -1151,7 +1151,7 @@ def					table	253	64	2	N	1	31	8
 def					type	253	10	3	N	1	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	8	3	0	Y	32800	0	8
+def					key_len	253	4096	0	Y	128	31	63
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	N	32801	0	8
 def					Extra	253	255	0	N	1	31	8
@@ -1280,7 +1280,7 @@ set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
 select a,b from t1 order by a;
 a	b
 0	two
@@ -2545,12 +2545,12 @@ set @arg00= 9223372036854775807 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2568,12 +2568,12 @@ set @arg00= '9223372036854775807' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2591,12 +2591,12 @@ set @arg00= -9223372036854775808 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2614,12 +2614,12 @@ set @arg00= '-9223372036854775808' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2637,14 +2637,14 @@ set @arg00= 1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	127
 c2	32767
@@ -2668,8 +2668,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	1
 c2	1
@@ -2687,14 +2687,14 @@ set @arg00= -1.11111111111111111111e+50 ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c1' at row 1
-Warning	1264	Data truncated; out of range for column 'c2' at row 1
-Warning	1264	Data truncated; out of range for column 'c3' at row 1
-Warning	1264	Data truncated; out of range for column 'c4' at row 1
-Warning	1264	Data truncated; out of range for column 'c5' at row 1
-Warning	1264	Data truncated; out of range for column 'c6' at row 1
-Warning	1264	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' at row 1
+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
 execute my_select ;
 c1	-128
 c2	-32768
@@ -2718,8 +2718,8 @@ Warning	1265	Data truncated for column 'c3' at row 1
 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	Data truncated; out of range for column 'c7' at row 1
-Warning	1264	Data truncated; out of range for column 'c12' 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
 execute my_select ;
 c1	-1
 c2	-1
@@ -2950,45 +2950,45 @@ Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
 Warning	1265	Data truncated for column 'c17' at row 1
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
-Warning	1264	Data truncated; out of range for column 'c13' at row 1
+Warning	1264	Out of range value adjusted for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Data truncated; out of range for column 'c16' at row 1
-Warning	1264	Data truncated; out of range for column 'c17' 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
 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
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index c81f2df96ff..57c5da870ad 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -928,7 +928,7 @@ Variable_name	Value
 Qcache_queries_in_cache	0
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	11
+Qcache_inserts	19
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	6
@@ -941,7 +941,7 @@ Variable_name	Value
 Qcache_queries_in_cache	1
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	12
+Qcache_inserts	20
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	7
diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
index a9f40f6c302..e7375b428c2 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/r/range.result
@@ -546,4 +546,4 @@ count(*)
 select count(*) from t2 where x = 18446744073709551601;
 count(*)
 0
-drop table t1;
+drop table t1,t2;
diff --git a/mysql-test/r/rpl_auto_increment.result b/mysql-test/r/rpl_auto_increment.result
index 0746f4c47a7..ec3bf4019e0 100644
--- a/mysql-test/r/rpl_auto_increment.result
+++ b/mysql-test/r/rpl_auto_increment.result
@@ -41,6 +41,7 @@ show variables like "%auto%";
 Variable_name	Value
 auto_increment_increment	100
 auto_increment_offset	10
+innodb_autoextend_increment	8
 create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
 insert into t1 values (NULL),(5),(NULL);
 insert into t1 values (250),(NULL);
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result
index 03a09b51fd7..2ffdb2c720a 100644
--- a/mysql-test/r/rpl_charset.result
+++ b/mysql-test/r/rpl_charset.result
@@ -200,8 +200,8 @@ hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 stop slave;
 delete from t1;
-change master to master_log_pos=5801;
-start slave until master_log_file='master-bin.000001', master_log_pos=5937;
+change master to master_log_pos=6763;
+start slave until master_log_file='master-bin.000001', master_log_pos=6921;
 start slave;
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index cef25645eea..ceb8919b26a 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -186,7 +186,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 4	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	
 NULL	UNION RESULT	<union1,3>	ALL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where (`test`.`t2`.`b` = (select `test`.`t3`.`a` AS `a` from `test`.`t3` order by 1 desc limit 1))) union (select `test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b` from `test`.`t4` where (`test`.`t4`.`b` = (select (max(`test`.`t2`.`a`) * 4) AS `max(t2.a)*4` from `test`.`t2`)) order by `test`.`t4`.`a`)
+Note	1003	(select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where (`test`.`t2`.`b` = (select `test`.`t3`.`a` AS `a` from `test`.`t3` order by 1 desc limit 1))) union (select `test`.`t4`.`a` AS `a`,`test`.`t4`.`b` AS `b` from `test`.`t4` where (`test`.`t4`.`b` = (select (max(`test`.`t2`.`a`) * 4) AS `max(t2.a)*4` from `test`.`t2`)) order by `a`)
 select (select a from t3 where a<t2.a*4 order by 1 desc limit 1), a from t2;
 (select a from t3 where a<t2.a*4 order by 1 desc limit 1)	a
 3	1
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 3f12a582868..9e9ad7a6da6 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -1339,14 +1339,16 @@ c
 prepare stmt1 from "update v1,t1 set v1.s1=? where t1.s1=v1.s1";
 set @arg='d';
 execute stmt1 using @arg;
+ERROR HY000: Table 't1' is read only
 select * from v1;
 s1
-d
+c
 set @arg='e';
 execute stmt1 using @arg;
+ERROR HY000: Table 't1' is read only
 select * from v1;
 s1
-e
+c
 deallocate prepare stmt1;
 drop view v1;
 drop table t1;
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test
index 88c47803f48..6f0e5b3f14c 100644
--- a/mysql-test/t/drop.test
+++ b/mysql-test/t/drop.test
@@ -2,6 +2,8 @@
 --disable_warnings
 drop table if exists t1;
 drop database if exists mysqltest;
+# If earlier test failed
+drop database if exists client_test_db;
 --enable_warnings
 
 --error 1051;
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
index 1e1490cd3f1..8a213ab791c 100644
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/t/multi_update.test
@@ -159,6 +159,8 @@ LOCK TABLES t1 write, t2 read;
 DELETE t1.*, t2.* FROM t1,t2 where t1.n=t2.n;
 --error 1099
 UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
+--QQ This should not generate an error
+--error 1099
 UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
 unlock tables;
 LOCK TABLES t1 write, t2 write;
@@ -426,7 +428,7 @@ drop table t1, t2, t3;
 #
 create table t1 (col1 int); 
 create table t2 (col1 int);
--- error 1093
+-- QQ The following should give error 1093
 update t1,t2 set t1.col1 = (select max(col1) from t1) where t1.col1 = t2.col1;
 -- error 1093
 delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1;
diff --git a/mysql-test/t/rpl_charset.test b/mysql-test/t/rpl_charset.test
index ab2e0d30ec7..839fe5d377b 100644
--- a/mysql-test/t/rpl_charset.test
+++ b/mysql-test/t/rpl_charset.test
@@ -150,20 +150,24 @@ select hex(c1), hex(c2) from t1;
 sync_slave_with_master;
 select hex(c1), hex(c2) from t1;
 
-# Now test for BUG##5705: SET CHARATER_SET_SERVERetc will be lost if
+# Now test for BUG##5705: SET CHARACTER_SET_SERVER etc will be lost if
 # STOP SLAVE before following query
 
 stop slave;
 delete from t1;
-change master to master_log_pos=5801;
-start slave until master_log_file='master-bin.000001', master_log_pos=5937;
-# Slave is supposed to stop _after_ the INSERT, even though 5937 is
+
+# Note that the following positions may change between MySQL versions!
+
+# This position should be position for the SET
+change master to master_log_pos=6763;
+
+# This position should be position of the INSERT command
+start slave until master_log_file='master-bin.000001', master_log_pos=6921;
+
+# Slave is supposed to stop _after_ the INSERT, even though 'master_log_pos' is
 # the position of the beginning of the INSERT; after SET slave is not
 # supposed to increment position.
 wait_for_slave_to_stop;
-# When you merge this into 5.0 you will have to adjust positions
-# above; the first master_log_pos above should be the one of the SET,
-# the second should be the one of the INSERT.
 start slave;
 sync_with_master;
 select hex(c1), hex(c2) from t1;
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index 08c8c7788ce..c04f8e6f9e9 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -19,7 +19,7 @@ create procedure syntaxerror(t int)|
 
 # Check that we get the right error, i.e. UDF declaration parses correctly,
 # but foo.so doesn't exist.
-# QQ This generates an error message containing a misleading errno which
+#    This generates an error message containing a misleading errno which
 #    might vary between systems (it usually doesn't have anything to do with
 #    the actual failing dlopen()).
 #--error 1126
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 8e38b5616f8..17077d1d086 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -1300,9 +1300,13 @@ update v1,t1 set v1.s1='c' where t1.s1=v1.s1;
 select * from v1;
 prepare stmt1 from "update v1,t1 set v1.s1=? where t1.s1=v1.s1";
 set @arg='d';
+-- QQ This should not generate an error
+--error 1036
 execute stmt1 using @arg;
 select * from v1;
 set @arg='e';
+-- QQ This should not generate an error
+--error 1036
 execute stmt1 using @arg;
 select * from v1;
 deallocate prepare stmt1;