after-merge fix: warning adjusted.

mysql-test/r/type_bit.result

@@ -605,7 +605,7 @@ drop table bug15583;
 create table t1(a bit(1), b smallint unsigned);
 insert into t1 (b, a) values ('2', '1');
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
+Warning	1264	Out of range value for column 'a' at row 1
 select hex(a), b from t1;
 hex(a)	b
 1	2