postreview changes

(used t3, moved after last bug, renamed)

mysql-test/r/sp.result

@@ -2379,18 +2379,17 @@ ERROR 42000: Can't find any matching row in the user table
 select bug5278()|
 ERROR 42000: Can't find any matching row in the user table
 drop function bug5278|
-drop table t1;
-drop table t2;
-drop procedure if exists p1;
-create table t1(id int);
-insert into t1 values(1);
-create procedure p1()
+drop procedure if exists p1|
+create table t3(id int)|
+insert into t3 values(1)|
+create procedure bug7992()
 begin
 declare i int;
-select max(id)+1 into i from t1;
-end
-//
-call p1()//
-call p1()//
-drop procedure p1;
+select max(id)+1 into i from t3;
+end|
+call bug7992()|
+call bug7992()|
+drop procedure bug7992|
+drop table t3|
 drop table t1;
+drop table t2;

mysql-test/t/sp.test

@@ -2849,28 +2849,26 @@ select bug5278()|
 select bug5278()|
 drop function bug5278|
 
-
-delimiter ;|
-drop table t1;
-drop table t2;
-
 #
-# rolling back temporary Item tree changes in SP
+# BUG#7992: rolling back temporary Item tree changes in SP
 #
 --disable_warnings
-drop procedure if exists p1;
+drop procedure if exists p1|
 --enable_warnings
-create table t1(id int);
-insert into t1 values(1);
-delimiter //;
-create procedure p1()
+create table t3(id int)|
+insert into t3 values(1)|
+create procedure bug7992()
 begin
   declare i int;
-  select max(id)+1 into i from t1;
-end
-//
-call p1()//
-call p1()//
-delimiter ;//
-drop procedure p1;
+  select max(id)+1 into i from t3;
+end|
+
+call bug7992()|
+call bug7992()|
+drop procedure bug7992|
+drop table t3|
+
+delimiter ;|
 drop table t1;
+drop table t2;
+