Fixed test for BUG#2614 (right name, right place, etc...),

and updated sp.result as well.

1 files changed, 18 insertions, 14 deletions

diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index a852e8ae148..3cb88ec5717 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -1120,6 +1120,24 @@ end|
 call bug2227(9)|
 drop procedure bug2227|
 
+#
+# BUG#2614
+#
+create procedure bug2614()
+begin
+  drop table if exists t3;
+  create table t3 (id int default '0' not null);
+  insert into t3 select 12;
+  insert into t3 select * from t3;
+end|
+
+--disable_warnings
+call bug2614()|
+--enable_warnings
+call bug2614()|
+drop table t3|
+drop procedure bug2614|
+
 
 #
 # Some "real" examples
@@ -1302,17 +1320,3 @@ drop procedure bar|
 delimiter ;|
 drop table t1;
 drop table t2;
-delimiter |
-drop procedure if exists  crash|
-create procedure crash()
- begin
-    drop table if exists t1;
-    create table t1 (id int default '0' not null);
-    insert into t1 select 12;
-    insert into t1 select * from t1;
- end|
-delimiter ;
-call crash();
-call crash();
-drop table t1;
-drop procedure if exists  crash;