bk commit into 5.0 tree (gshchepa:1.2528) BUG#29338

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.0 repository of uchum. When uchum 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, 2007-07-22 01:49:41+05:00, gshchepa@stripped +2 -0
  sp.test, sp.result:
    Additional test case fix for bug #29338.

  mysql-test/r/sp.result@stripped, 2007-07-22 01:48:55+05:00, gshchepa@stripped +1 -0
    Additional test case fix for bug #29338.

  mysql-test/t/sp.test@stripped, 2007-07-22 01:48:38+05:00, gshchepa@stripped +1 -0
    Additional test case fix for bug #29338.

diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result	2007-07-19 18:38:52 +05:00
+++ b/mysql-test/r/sp.result	2007-07-22 01:48:55 +05:00
@@ -6206,5 +6206,6 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t1	index	NULL	c1	5	NULL	5	Using where; Using index
 DROP VIEW v1;
 DROP FUNCTION f1;
+DROP FUNCTION f2;
 DROP TABLE t1;
 End of 5.0 tests
diff -Nrup a/mysql-test/t/sp.test b/mysql-test/t/sp.test
--- a/mysql-test/t/sp.test	2007-07-19 18:38:52 +05:00
+++ b/mysql-test/t/sp.test	2007-07-22 01:48:38 +05:00
@@ -7163,6 +7163,7 @@ EXPLAIN SELECT * FROM t1 WHERE c1=f2(ran
 
 DROP VIEW v1;
 DROP FUNCTION f1;
+DROP FUNCTION f2;
 DROP TABLE t1;
 
 --echo End of 5.0 tests