diff --git a/mysql-test/r/sp-big.result b/mysql-test/r/sp-big.result
index d28b7004330..9765508859c 100644
--- a/mysql-test/r/sp-big.result
+++ b/mysql-test/r/sp-big.result
@@ -46,8 +46,6 @@ end while;
 close cur1;
 end|
 call p1();
-Warnings:
-Error	1329	No data - zero rows fetched, selected, or processed
 select count(*) from t1;
 count(*)
 256
diff --git a/mysql-test/r/sp-bugs.result b/mysql-test/r/sp-bugs.result
index 9d9deaebcc3..eef51385fb1 100644
--- a/mysql-test/r/sp-bugs.result
+++ b/mysql-test/r/sp-bugs.result
@@ -43,8 +43,6 @@ END|
 SELECT f2 ();
 f2 ()
 NULL
-Warnings:
-Error	1305	FUNCTION testdb.f_not_exists does not exist
 DROP SCHEMA testdb;
 USE test;
 #
diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result
index 3bead4fc826..c9d2f7b023a 100644
--- a/mysql-test/r/sp-code.result
+++ b/mysql-test/r/sp-code.result
@@ -711,8 +711,6 @@ looping	i
 looping	1
 looping	i
 looping	0
-Warnings:
-Error	1062	Duplicate entry '1' for key 'a'
 call proc_26977_works(2);
 do something
 do something
@@ -732,8 +730,6 @@ looping	i
 looping	0
 optimizer: keep hreturn
 optimizer: keep hreturn
-Warnings:
-Error	1062	Duplicate entry '2' for key 'a'
 drop table t1;
 drop procedure proc_26977_broken;
 drop procedure proc_26977_works;
diff --git a/mysql-test/r/sp-destruct.result b/mysql-test/r/sp-destruct.result
index 6d85c3ce496..172e40cb40c 100644
--- a/mysql-test/r/sp-destruct.result
+++ b/mysql-test/r/sp-destruct.result
@@ -149,7 +149,7 @@ alter table mysql.proc drop column type;
 # The below statement should not cause assertion failure.
 drop database mysqltest;
 Warnings:
-Error	1728	Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
+Error	1805	Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
 # Restore mysql.proc.
 drop table mysql.proc;
 #
@@ -166,7 +166,7 @@ CREATE PROCEDURE db1.p1() SET @foo = 10;
 ALTER TABLE mysql.proc MODIFY comment CHAR (32);
 DROP DATABASE db1;
 Warnings:
-Error	1729	Cannot load from mysql.proc. The table is probably corrupted
+Error	1728	Cannot load from mysql.proc. The table is probably corrupted
 # Restore mysql.proc
 DROP TABLE mysql.proc;
 RENAME TABLE proc_backup TO mysql.proc;
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index 24cbb945fd2..3862309873b 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/r/sp-error.result
@@ -466,7 +466,7 @@ drop table t5;
 end|
 create table t5 (x int)|
 call bug3294()|
-ERROR 42S02: Unknown table 't5'
+ERROR 42S02: Unknown table 'test.t5'
 drop procedure bug3294|
 drop procedure if exists bug8776_1|
 drop procedure if exists bug8776_2|
@@ -1344,8 +1344,6 @@ set @in_func := 0;
 select func_20713_a();
 func_20713_a()
 NULL
-Warnings:
-Error	1146	Table 'test.bogus_table_20713' doesn't exist
 select @in_func;
 @in_func
 2
@@ -1353,8 +1351,6 @@ set @in_func := 0;
 select func_20713_b();
 func_20713_b()
 NULL
-Warnings:
-Error	1146	Table 'test.bogus_table_20713' doesn't exist
 select @in_func;
 @in_func
 2
@@ -1567,7 +1563,7 @@ f2()
 1
 drop function f2;
 drop table t2;
-ERROR 42S02: Unknown table 't2'
+ERROR 42S02: Unknown table 'test.t2'
 End of 5.1 tests
 drop procedure if exists proc_33983_a;
 drop procedure if exists proc_33983_b;
@@ -1821,11 +1817,8 @@ CAST('10 ' as unsigned integer)
 c
 3
 @@warning_count
-1
+0
 Level	Code	Message
-Warning	1292	Truncated incorrect INTEGER value: '10 '
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '10 '
 CALL p6();
 CAST('10 ' as unsigned integer)
 10
@@ -1833,8 +1826,6 @@ Level	Code	Message
 Warning	1292	Truncated incorrect INTEGER value: '10 '
 c
 1
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '10 '
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
 DROP PROCEDURE p3;
@@ -1885,9 +1876,6 @@ END|
 CALL p1();
 exception
 exception
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '10 '
-Error	1048	Column 'b' cannot be null
 DROP TABLE t1;
 DROP PROCEDURE p1;
 #
@@ -1931,11 +1919,8 @@ CALL p1();
 NULL
 warning caught (expected)
 warning caught (expected)
-Warnings:
-Warning	1365	Division by 0
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1365	Division by 0
 CALL p2();
 5 / 0
 NULL
diff --git a/mysql-test/r/sp_trans.result b/mysql-test/r/sp_trans.result
index b91dc898f12..5526fc19aae 100644
--- a/mysql-test/r/sp_trans.result
+++ b/mysql-test/r/sp_trans.result
@@ -99,8 +99,6 @@ return i;
 end|
 set @error_in_func:= 0|
 insert into t1 values (bug10015_6(5)), (bug10015_6(6))|
-Warnings:
-Error	1062	Duplicate entry '1' for key 'PRIMARY'
 select @error_in_func|
 @error_in_func
 1
@@ -526,8 +524,6 @@ until done end repeat;
 close c;
 end|
 call bug14210()|
-Warnings:
-Error	1329	No data - zero rows fetched, selected, or processed
 select count(*) from t4|
 count(*)
 256