bk commit into 5.1 tree (kaa:1.2556)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa.  When kaa 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@stripped, 2008-02-17 15:07:41+03:00, kaa@kaamos.(none) +1 -0
  Post-merge fix.

  mysql-test/t/sp.test@stripped, 2008-02-17 15:07:40+03:00, kaa@kaamos.(none) +19 -19
    Post-merge fix.

diff -Nrup a/mysql-test/t/sp.test b/mysql-test/t/sp.test
--- a/mysql-test/t/sp.test	2008-02-17 14:50:31 +03:00
+++ b/mysql-test/t/sp.test	2008-02-17 15:07:40 +03:00
@@ -7900,25 +7900,6 @@ DROP DATABASE db28318_a;
 DROP DATABASE db28318_b;
 use test;
 
---echo #
---echo # Bug#30787: Stored function ignores user defined alias.
---echo #
-use test;
---disable_warnings
-drop function if exists func30787;
---enable_warnings
-create table t1(f1 int);
-insert into t1 values(1),(2);
-delimiter |;
-create function func30787(p1 int) returns int
-begin
-  return p1;
-end |
-delimiter ;|
-select (select func30787(f1)) as ttt from t1;
-drop function func30787;
-drop table t1;
-
 ###########################################################################
 
 #
@@ -7995,6 +7976,25 @@ call proc_33618(20);
 
 drop table t_33618;
 drop procedure proc_33618;
+
+--echo #
+--echo # Bug#30787: Stored function ignores user defined alias.
+--echo #
+use test;
+--disable_warnings
+drop function if exists func30787;
+--enable_warnings
+create table t1(f1 int);
+insert into t1 values(1),(2);
+delimiter |;
+create function func30787(p1 int) returns int
+begin
+  return p1;
+end |
+delimiter ;|
+select (select func30787(f1)) as ttt from t1;
+drop function func30787;
+drop table t1;
 
 ###########################################################################