bk commit into 5.0 tree (gshchepa:1.2523) BUG#28898

[<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-06-20 14:21:48+05:00, gshchepa@stripped +2 -0
  metadata.test, metadata.result:
    Updated test case for bug #28898. Additional cleanup.

  mysql-test/r/metadata.result@stripped, 2007-06-20 14:20:41+05:00, gshchepa@stripped +1 -1
    Updated test case for bug #28898. Additional cleanup.

  mysql-test/t/metadata.test@stripped, 2007-06-20 14:19:48+05:00, gshchepa@stripped +1 -1
    Updated test case for bug #28898. Additional cleanup.

# 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:	gshchepa
# Host:	gleb.loc
# Root:	/home/uchum/work/bk/5.0-opt-28898

--- 1.17/mysql-test/r/metadata.result	2007-06-20 12:18:53 +05:00
+++ 1.18/mysql-test/r/metadata.result	2007-06-20 14:20:41 +05:00
@@ -179,6 +179,6 @@ c1	c2
 1	1
 2	2
 3	3
-DROP VIEW v1;
+DROP VIEW v1,v2;
 DROP TABLE t1,t2;
 End of 5.0 tests

--- 1.8/mysql-test/t/metadata.test	2007-06-20 12:18:52 +05:00
+++ 1.9/mysql-test/t/metadata.test	2007-06-20 14:19:48 +05:00
@@ -109,7 +109,7 @@ SELECT v1.c1, v2.c2 FROM v1 JOIN v2 ON c
 SELECT v1.c1, v2.c2 FROM v1 JOIN v2 ON c1=c2 GROUP BY v1.c1 ORDER BY v2.c2;
 --disable_metadata
 
-DROP VIEW v1;
+DROP VIEW v1,v2;
 DROP TABLE t1,t2;
 
 --echo End of 5.0 tests