diff --git a/mysql-test/main/sp-error.result b/mysql-test/main/sp-error.result
index f4928d16f55..1c272a03695 100644
--- a/mysql-test/main/sp-error.result
+++ b/mysql-test/main/sp-error.result
@@ -1608,15 +1608,6 @@ CALL p1((SELECT * FROM t1))|
 ERROR 21000: Subquery returns more than 1 row
 DROP PROCEDURE IF EXISTS p1|
 DROP TABLE t1|
-drop procedure if exists p1;
-create procedure p1()
-begin
-create table t1 (a int) engine=MyISAM;
-drop table t1;
-end|
-call p1();
-call p1();
-drop procedure p1;
 drop procedure if exists proc_8759;
 create procedure proc_8759()
 begin
diff --git a/mysql-test/main/sp-error.test b/mysql-test/main/sp-error.test
index c112dd0f531..584ef5a6375 100644
--- a/mysql-test/main/sp-error.test
+++ b/mysql-test/main/sp-error.test
@@ -2349,24 +2349,6 @@ DROP TABLE t1|
 
 delimiter ;|
 
-#
-# Bug#21801: SQL exception handlers and warnings
-#
-
---disable_warnings
-drop procedure if exists p1;
---enable_warnings
-delimiter |;
-create procedure p1()
-begin
-  create table t1 (a int) engine=MyISAM;
-  drop table t1;
-end|
-delimiter ;|
-call p1();
-call p1();
-drop procedure p1;
-
 #
 # Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)
 #