fix main.sp test failures

make the select from mysql.proc stable and independent from
previous operations on the table.

also, remove redundant drops.

2 files changed, 2 insertions, 11 deletions

diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index 3ae74a70687..c460ecaa7bd 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -6237,9 +6237,6 @@ NULL
 set @@character_set_client=@save_character_set_client;
 set @@character_set_results=@save_character_set_client;
 DROP PROCEDURE p1;
-drop procedure if exists proc_25411_a;
-drop procedure if exists proc_25411_b;
-drop procedure if exists proc_25411_c;
 create procedure proc_25411_a()
 begin
 /* real comment */
@@ -6300,7 +6297,7 @@ proc_25411_b		CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_25411_b`(
 begin
 select p1, p2;
 end	latin1	latin1_swedish_ci	latin1_swedish_ci
-select name, param_list, body from mysql.proc where name like "%25411%";
+select name, param_list, body from mysql.proc where name like "%25411%" order by name;
 name	param_list	body
 proc_25411_a		begin
 /* real comment */
diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test
index e3bde31f572..8157f18aad1 100644
--- a/mysql-test/main/sp.test
+++ b/mysql-test/main/sp.test
@@ -7366,12 +7366,6 @@ DROP PROCEDURE p1;
 # Bug#25411 (trigger code truncated)
 #
 
---disable_warnings
-drop procedure if exists proc_25411_a;
-drop procedure if exists proc_25411_b;
-drop procedure if exists proc_25411_c;
---enable_warnings
-
 delimiter $$;
 
 create procedure proc_25411_a()
@@ -7412,7 +7406,7 @@ show create procedure proc_25411_a;
 call proc_25411_a();
 
 show create procedure proc_25411_b;
-select name, param_list, body from mysql.proc where name like "%25411%";
+select name, param_list, body from mysql.proc where name like "%25411%" order by name;
 call proc_25411_b(10, 20);
 
 show create procedure proc_25411_c;