bk commit into 6.0 tree (davi:1.2623)

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
6.0 repository of davi.  When davi 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-04-22 18:06:37-03:00, davi@stripped +2 -0
  Post merge fix for bug 31881.
  
  At the end of the test case, drop functions used for testing. 

  mysql-test/r/errors.result@stripped, 2008-04-22 18:06:33-03:00, davi@stripped +2 -0
    Update test case result.

  mysql-test/t/errors.test@stripped, 2008-04-22 18:06:34-03:00, davi@stripped +2 -0
    Drop functions at test end.

diff -Nrup a/mysql-test/r/errors.result b/mysql-test/r/errors.result
--- a/mysql-test/r/errors.result	2008-04-22 16:32:38 -03:00
+++ b/mysql-test/r/errors.result	2008-04-22 18:06:33 -03:00
@@ -89,3 +89,5 @@ select * from t2;
 a
 drop table t1;
 drop table t2;
+drop function f1;
+drop function f2;
diff -Nrup a/mysql-test/t/errors.test b/mysql-test/t/errors.test
--- a/mysql-test/t/errors.test	2008-04-22 16:32:38 -03:00
+++ b/mysql-test/t/errors.test	2008-04-22 18:06:34 -03:00
@@ -100,3 +100,5 @@ select * from t1;
 select * from t2;
 drop table t1;
 drop table t2;
+drop function f1;
+drop function f2;