bk commit into 5.0 tree (petr:1.1952)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1952 05/09/13 19:59:26 petr@stripped +1 -0
  after-merge fix

  mysql-test/t/sp.test
    1.149 05/09/13 19:59:13 petr@stripped +15 -15
    after-merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.0-virgin

--- 1.148/mysql-test/t/sp.test	2005-09-13 18:50:44 +04:00
+++ 1.149/mysql-test/t/sp.test	2005-09-13 19:59:13 +04:00
@@ -4108,21 +4108,6 @@
 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
 #
@@ -4176,6 +4161,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