Automerge fix: "Out of range value" error message adjusted to 5.1.

9 files changed, 94 insertions, 104 deletions

diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 33f6c0c7af2..a9683cc7c56 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -112,8 +112,8 @@ slow_log	CREATE TABLE `slow_log` (
 alter table mysql.general_log engine=myisam;
 alter table mysql.slow_log engine=myisam;
 Warnings:
-Warning	1264	Out of range value for column 'last_insert_id' at row 0
-Warning	1264	Out of range value for column 'insert_id' at row 0
+Warning	1366	Incorrect integer value: '' for column 'last_insert_id' at row 0
+Warning	1366	Incorrect integer value: '' for column 'insert_id' at row 0
 show create table mysql.general_log;
 Table	Create Table
 general_log	CREATE TABLE `general_log` (
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
index 597310e58b3..2bfd6d31ac9 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
@@ -2689,12 +2689,12 @@ set @arg00= '1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
@@ -2739,12 +2739,12 @@ set @arg00= '-1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index fc32d0a62ab..607a0426bd7 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -2672,12 +2672,12 @@ set @arg00= '1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
@@ -2722,12 +2722,12 @@ set @arg00= '-1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index f327c4ad3be..f4eec0c610c 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -2673,12 +2673,12 @@ set @arg00= '1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
@@ -2723,12 +2723,12 @@ set @arg00= '-1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result
index 6c9a9af69ab..38e4626d59c 100644
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/r/ps_5merge.result
@@ -2609,12 +2609,12 @@ set @arg00= '1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
@@ -2659,12 +2659,12 @@ set @arg00= '-1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
@@ -5623,12 +5623,12 @@ set @arg00= '1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
@@ -5673,12 +5673,12 @@ set @arg00= '-1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/r/ps_7ndb.result
index 678a0d63b3d..9e0577f8ae2 100644
--- a/mysql-test/r/ps_7ndb.result
+++ b/mysql-test/r/ps_7ndb.result
@@ -2672,12 +2672,12 @@ set @arg00= '1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
@@ -2722,12 +2722,12 @@ set @arg00= '-1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'c1' at row 1
-Warning	1264	Out of range value adjusted for column 'c2' at row 1
-Warning	1264	Out of range value adjusted for column 'c3' at row 1
-Warning	1264	Out of range value adjusted for column 'c4' at row 1
-Warning	1264	Out of range value adjusted for column 'c5' at row 1
-Warning	1264	Out of range value adjusted for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
diff --git a/mysql-test/r/round.result b/mysql-test/r/round.result
index e9a80df0f49..49a00885f34 100644
--- a/mysql-test/r/round.result
+++ b/mysql-test/r/round.result
@@ -5,7 +5,7 @@ INSERT INTO t1 VALUES ('0.5');
 INSERT INTO t1 VALUES ('127.4');
 INSERT INTO t1 VALUES ('127.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'sint8' at row 1
+Warning	1264	Out of range value for column 'sint8' at row 1
 INSERT INTO t1 VALUES ('-0.1');
 INSERT INTO t1 VALUES ('-0.5');
 INSERT INTO t1 VALUES ('-127.4');
@@ -13,7 +13,7 @@ INSERT INTO t1 VALUES ('-127.5');
 INSERT INTO t1 VALUES ('-128.4');
 INSERT INTO t1 VALUES ('-128.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'sint8' at row 1
+Warning	1264	Out of range value for column 'sint8' at row 1
 SELECT * FROM t1;
 sint8
 0
@@ -35,11 +35,11 @@ INSERT INTO t1 VALUES ('127.5');
 INSERT INTO t1 VALUES ('-0.1');
 INSERT INTO t1 VALUES ('-0.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'uint8' at row 1
+Warning	1264	Out of range value for column 'uint8' at row 1
 INSERT INTO t1 VALUES ('255.4');
 INSERT INTO t1 VALUES ('255.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'uint8' at row 1
+Warning	1264	Out of range value for column 'uint8' at row 1
 SELECT * FROM t1;
 uint8
 0
@@ -57,7 +57,7 @@ INSERT INTO t1 VALUES ('0.5');
 INSERT INTO t1 VALUES ('32767.4');
 INSERT INTO t1 VALUES ('32767.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'sint16' at row 1
+Warning	1264	Out of range value for column 'sint16' at row 1
 INSERT INTO t1 VALUES ('-0.1');
 INSERT INTO t1 VALUES ('-0.5');
 INSERT INTO t1 VALUES ('-32767.4');
@@ -65,7 +65,7 @@ INSERT INTO t1 VALUES ('-32767.5');
 INSERT INTO t1 VALUES ('-32768.4');
 INSERT INTO t1 VALUES ('-32768.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'sint16' at row 1
+Warning	1264	Out of range value for column 'sint16' at row 1
 SELECT * FROM t1;
 sint16
 0
@@ -87,11 +87,11 @@ INSERT INTO t1 VALUES ('32767.5');
 INSERT INTO t1 VALUES ('-0.1');
 INSERT INTO t1 VALUES ('-0.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'uint16' at row 1
+Warning	1264	Out of range value for column 'uint16' at row 1
 INSERT INTO t1 VALUES ('65535.4');
 INSERT INTO t1 VALUES ('65535.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'uint16' at row 1
+Warning	1264	Out of range value for column 'uint16' at row 1
 SELECT * FROM t1;
 uint16
 0
@@ -109,7 +109,7 @@ INSERT INTO t1 VALUES ('0.5');
 INSERT INTO t1 VALUES ('8388607.4');
 INSERT INTO t1 VALUES ('8388607.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'sint24' at row 1
+Warning	1264	Out of range value for column 'sint24' at row 1
 INSERT INTO t1 VALUES ('-0.1');
 INSERT INTO t1 VALUES ('-0.5');
 INSERT INTO t1 VALUES ('-8388607.4');
@@ -117,7 +117,7 @@ INSERT INTO t1 VALUES ('-8388607.5');
 INSERT INTO t1 VALUES ('-8388608.4');
 INSERT INTO t1 VALUES ('-8388608.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'sint24' at row 1
+Warning	1264	Out of range value for column 'sint24' at row 1
 SELECT * FROM t1;
 sint24
 0
@@ -139,11 +139,11 @@ INSERT INTO t1 VALUES ('8388607.5');
 INSERT INTO t1 VALUES ('-0.1');
 INSERT INTO t1 VALUES ('-0.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'uint24' at row 1
+Warning	1264	Out of range value for column 'uint24' at row 1
 INSERT INTO t1 VALUES ('16777215.4');
 INSERT INTO t1 VALUES ('16777215.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'uint24' at row 1
+Warning	1264	Out of range value for column 'uint24' at row 1
 SELECT * FROM t1;
 uint24
 0
@@ -161,7 +161,7 @@ INSERT INTO t1 VALUES ('0.5');
 INSERT INTO t1 VALUES ('9223372036854775807.4');
 INSERT INTO t1 VALUES ('9223372036854775807.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'sint64' at row 1
+Warning	1264	Out of range value for column 'sint64' at row 1
 INSERT INTO t1 VALUES ('-0.1');
 INSERT INTO t1 VALUES ('-0.5');
 INSERT INTO t1 VALUES ('-9223372036854775807.4');
@@ -169,7 +169,7 @@ INSERT INTO t1 VALUES ('-9223372036854775807.5');
 INSERT INTO t1 VALUES ('-9223372036854775808.4');
 INSERT INTO t1 VALUES ('-9223372036854775808.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'sint64' at row 1
+Warning	1264	Out of range value for column 'sint64' at row 1
 SELECT * FROM t1;
 sint64
 0
@@ -191,11 +191,11 @@ INSERT INTO t1 VALUES ('9223372036854775807.5');
 INSERT INTO t1 VALUES ('-0.1');
 INSERT INTO t1 VALUES ('-0.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'uint64' at row 1
+Warning	1264	Out of range value for column 'uint64' at row 1
 INSERT INTO t1 VALUES ('18446744073709551615.4');
 INSERT INTO t1 VALUES ('18446744073709551615.5');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'uint64' at row 1
+Warning	1264	Out of range value for column 'uint64' at row 1
 INSERT INTO t1 VALUES ('1844674407370955161.0');
 INSERT INTO t1 VALUES ('1844674407370955161.1');
 INSERT INTO t1 VALUES ('1844674407370955161.2');
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 254f91d27d9..8800ce248d5 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2730,16 +2730,6 @@ ERROR 42000: Key 'a' doesn't exist in table 't1'
 EXPLAIN SELECT * FROM t1 FORCE INDEX (a);
 ERROR 42000: Key 'a' doesn't exist in table 't1'
 DROP TABLE t1;
-ERROR HY000: Key 'a' doesn't exist in table 't1'
-EXPLAIN SELECT * FROM t1 FORCE INDEX (a);
-ERROR HY000: Key 'a' doesn't exist in table 't1'
-DROP TABLE t1;
-CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);
-INSERT INTO t1 VALUES (10);
-SELECT i='1e+01',i=1e+01, i in (1e+01,1e+01), i in ('1e+01','1e+01') FROM t1;
-i='1e+01'	i=1e+01	i in (1e+01,1e+01)	i in ('1e+01','1e+01')
-1	1	1	1
-DROP TABLE t1;
 CREATE TABLE t1 (a int, b int);
 INSERT INTO t1 VALUES (1,1), (2,1), (4,10);
 CREATE TABLE t2 (a int PRIMARY KEY, b int, KEY b (b));
@@ -2819,7 +2809,7 @@ CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);
 INSERT INTO t1 VALUES (10);
 SELECT i='1e+01',i=1e+01, i in (1e+01,1e+01), i in ('1e+01','1e+01') FROM t1;
 i='1e+01'	i=1e+01	i in (1e+01,1e+01)	i in ('1e+01','1e+01')
-0	1	1	1
+1	1	1	1
 DROP TABLE t1;
 CREATE TABLE t1 ( 
 K2C4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '', 
diff --git a/mysql-test/r/strict_autoinc_4bdb.result b/mysql-test/r/strict_autoinc_4bdb.result
index 73683b645e2..48ebe196baf 100644
--- a/mysql-test/r/strict_autoinc_4bdb.result
+++ b/mysql-test/r/strict_autoinc_4bdb.result
@@ -6,21 +6,21 @@ primary key (`a`)
 ) engine = 'BDB'  ;
 set @@sql_mode='strict_all_tables';
 insert into t1 values(1000);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set auto_increment_increment=1000;
 set auto_increment_offset=700;
 insert into t1 values(null);
-ERROR 22003: Out of range value adjusted for column 'a' at row 1
+ERROR 22003: Out of range value for column 'a' at row 1
 select count(*) from t1;
 count(*)
 0
 set @@sql_mode=@org_mode;
 insert into t1 values(null);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select * from t1;
 a
 127