after-merge fix

mysql-test/t/sp.test

@@ -4107,21 +4107,6 @@ select bug131333()|
 drop procedure bug131333|
 drop function bug131333|
 
-#
-# Bug #13124    Stored Procedure using SELECT INTO crashes server
-#
-
---disable_warnings
-drop procedure if exists bug13124|
---enable_warnings
-create procedure bug13124()
-begin
-  declare y integer;
-  set @x=y;
-end|
-call bug13124()|
-drop procedure  bug13124|
-
 #
 # BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error get
 #            strange result
@@ -4177,6 +4162,21 @@ drop procedure bug12379_1|
 drop procedure bug12379_2|
 drop procedure bug12379_3|
 
+#
+# Bug #13124    Stored Procedure using SELECT INTO crashes server
+#
+
+--disable_warnings
+drop procedure if exists bug13124|
+--enable_warnings
+create procedure bug13124()
+begin
+  declare y integer;
+  set @x=y;
+end|
+call bug13124()|
+drop procedure  bug13124|
+
 #
 # BUG#NNNN: New bug synopsis
 #