Cought errors are not shown

1 files changed, 1 insertions, 43 deletions

diff --git a/mysql-test/r/signal.result b/mysql-test/r/signal.result
index 062b866475d..b3d873b07bb 100644
--- a/mysql-test/r/signal.result
+++ b/mysql-test/r/signal.result
@@ -1191,8 +1191,6 @@ end $$
 call test_signal() $$
 Caught by SQLSTATE
 Caught by SQLSTATE
-Warnings:
-Warning	1012	Raising a warning
 drop procedure test_signal $$
 create procedure test_signal()
 begin
@@ -1208,8 +1206,6 @@ end $$
 call test_signal() $$
 Caught by number
 Caught by number
-Warnings:
-Warning	1012	Raising a warning
 drop procedure test_signal $$
 create procedure test_signal()
 begin
@@ -1225,8 +1221,6 @@ end $$
 call test_signal() $$
 Caught by SQLWARNING
 Caught by SQLWARNING
-Warnings:
-Warning	1012	Raising a warning
 drop procedure test_signal $$
 create procedure test_signal()
 begin
@@ -1242,8 +1236,6 @@ end $$
 call test_signal() $$
 Caught by SQLSTATE
 Caught by SQLSTATE
-Warnings:
-Error	1012	Raising a not found
 drop procedure test_signal $$
 create procedure test_signal()
 begin
@@ -1259,8 +1251,6 @@ end $$
 call test_signal() $$
 Caught by number
 Caught by number
-Warnings:
-Error	1012	Raising a not found
 drop procedure test_signal $$
 create procedure test_signal()
 begin
@@ -1276,8 +1266,6 @@ end $$
 call test_signal() $$
 Caught by NOT FOUND
 Caught by NOT FOUND
-Warnings:
-Error	1012	Raising a not found
 drop procedure test_signal $$
 create procedure test_signal()
 begin
@@ -1293,8 +1281,6 @@ end $$
 call test_signal() $$
 Caught by SQLSTATE
 Caught by SQLSTATE
-Warnings:
-Error	1012	Raising an error
 drop procedure test_signal $$
 create procedure test_signal()
 begin
@@ -1310,8 +1296,6 @@ end $$
 call test_signal() $$
 Caught by number
 Caught by number
-Warnings:
-Error	1012	Raising an error
 drop procedure test_signal $$
 create procedure test_signal()
 begin
@@ -1327,8 +1311,6 @@ end $$
 call test_signal() $$
 Caught by SQLEXCEPTION
 Caught by SQLEXCEPTION
-Warnings:
-Error	1012	Raising an error
 drop procedure test_signal $$
 #
 # Test where SIGNAL can be used
@@ -1557,7 +1539,7 @@ end $$
 call test_resignal() $$
 before RESIGNAL
 before RESIGNAL
-ERROR 42S02: Unknown table 'no_such_table'
+ERROR 42S02: Unknown table 'test.no_such_table'
 drop procedure test_resignal $$
 create procedure test_resignal()
 begin
@@ -1703,7 +1685,6 @@ before RESIGNAL
 after RESIGNAL
 after RESIGNAL
 Warnings:
-Warning	1012	Raising a warning
 Warning	5555	RESIGNAL to warning
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1727,7 +1708,6 @@ before RESIGNAL
 ERROR 02222: RESIGNAL to not found
 show warnings $$
 Level	Code	Message
-Warning	1012	Raising a warning
 Error	5555	RESIGNAL to not found
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1751,7 +1731,6 @@ before RESIGNAL
 ERROR 33333: RESIGNAL to error
 show warnings $$
 Level	Code	Message
-Warning	1012	Raising a warning
 Error	5555	RESIGNAL to error
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1775,7 +1754,6 @@ before RESIGNAL
 after RESIGNAL
 after RESIGNAL
 Warnings:
-Error	1012	Raising a not found
 Warning	5555	RESIGNAL to warning
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1799,7 +1777,6 @@ before RESIGNAL
 ERROR 02222: RESIGNAL to not found
 show warnings $$
 Level	Code	Message
-Error	1012	Raising a not found
 Error	5555	RESIGNAL to not found
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1823,7 +1800,6 @@ before RESIGNAL
 ERROR 33333: RESIGNAL to error
 show warnings $$
 Level	Code	Message
-Error	1012	Raising a not found
 Error	5555	RESIGNAL to error
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1847,7 +1823,6 @@ before RESIGNAL
 after RESIGNAL
 after RESIGNAL
 Warnings:
-Error	1012	Raising an error
 Warning	5555	RESIGNAL to warning
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1871,7 +1846,6 @@ before RESIGNAL
 ERROR 02222: RESIGNAL to not found
 show warnings $$
 Level	Code	Message
-Error	1012	Raising an error
 Error	5555	RESIGNAL to not found
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1895,7 +1869,6 @@ before RESIGNAL
 ERROR 33333: RESIGNAL to error
 show warnings $$
 Level	Code	Message
-Error	1012	Raising an error
 Error	5555	RESIGNAL to error
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1916,7 +1889,6 @@ before RESIGNAL
 after RESIGNAL
 after RESIGNAL
 Warnings:
-Warning	1264	Out of range value for column 'a' at row 1
 Warning	5555	RESIGNAL to a warning
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1937,7 +1909,6 @@ before RESIGNAL
 ERROR 02444: RESIGNAL to a not found
 show warnings $$
 Level	Code	Message
-Warning	1264	Out of range value for column 'a' at row 1
 Error	5555	RESIGNAL to a not found
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1958,7 +1929,6 @@ before RESIGNAL
 ERROR 44444: RESIGNAL to an error
 show warnings $$
 Level	Code	Message
-Warning	1264	Out of range value for column 'a' at row 1
 Error	5555	RESIGNAL to an error
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -1983,7 +1953,6 @@ before RESIGNAL
 after RESIGNAL
 after RESIGNAL
 Warnings:
-Error	1329	No data - zero rows fetched, selected, or processed
 Warning	5555	RESIGNAL to a warning
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -2008,7 +1977,6 @@ before RESIGNAL
 ERROR 02444: RESIGNAL to a not found
 show warnings $$
 Level	Code	Message
-Error	1329	No data - zero rows fetched, selected, or processed
 Error	5555	RESIGNAL to a not found
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -2033,7 +2001,6 @@ before RESIGNAL
 ERROR 44444: RESIGNAL to an error
 show warnings $$
 Level	Code	Message
-Error	1329	No data - zero rows fetched, selected, or processed
 Error	5555	RESIGNAL to an error
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -2054,7 +2021,6 @@ before RESIGNAL
 after RESIGNAL
 after RESIGNAL
 Warnings:
-Error	1051	Unknown table 'no_such_table'
 Warning	5555	RESIGNAL to a warning
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -2075,7 +2041,6 @@ before RESIGNAL
 ERROR 02444: RESIGNAL to a not found
 show warnings $$
 Level	Code	Message
-Error	1051	Unknown table 'no_such_table'
 Error	5555	RESIGNAL to a not found
 drop procedure test_resignal $$
 create procedure test_resignal()
@@ -2096,7 +2061,6 @@ before RESIGNAL
 ERROR 44444: RESIGNAL to an error
 show warnings $$
 Level	Code	Message
-Error	1051	Unknown table 'no_such_table'
 Error	5555	RESIGNAL to an error
 drop procedure test_resignal $$
 #
@@ -2199,15 +2163,10 @@ Error	1232	Variable 'sql_mode' can't be set to the value of 'NULL'
 3
 3
 Level	Code	Message
-Error	1231	Variable 'sql_mode' can't be set to the value of 'NULL'
-Error	1232	Variable 'sql_mode' can't be set to the value of 'NULL'
 Error	9999	Variable 'sql_mode' can't be set to the value of 'NULL'
 ERROR 42000: Hi, I am a useless error message
 show warnings $$
 Level	Code	Message
-Error	1231	Variable 'sql_mode' can't be set to the value of 'NULL'
-Error	1232	Variable 'sql_mode' can't be set to the value of 'NULL'
-Error	9999	Variable 'sql_mode' can't be set to the value of 'NULL'
 Error	9999	Hi, I am a useless error message
 drop procedure peter_p1 $$
 drop procedure peter_p2 $$
@@ -2224,7 +2183,6 @@ call peter_p3() $$
 ERROR 99002: Original
 show warnings $$
 Level	Code	Message
-Error	1	Original
 Error	2	Original
 drop procedure peter_p3 $$
 drop table t_warn;