Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

mysql-test/r/strict.result

@@ -1180,7 +1180,8 @@ Note	1305	PROCEDURE t1 does not exist
 create procedure t1 () begin declare exit handler for sqlexception
 select'a'; insert into t1 values (200); end;|
 call t1();
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+a
+a
 select * from t1;
 col1
 drop procedure t1;

mysql-test/t/strict.test

@@ -1040,7 +1040,6 @@ delimiter |;
 create procedure t1 () begin declare exit handler for sqlexception
 select'a'; insert into t1 values (200); end;|
 delimiter ;|
---error 1264
 call t1();
 select * from t1;
 drop procedure t1;