Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898

into gleb.loc:/home/uchum/work/bk/5.0-opt

Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898
into gleb.loc:/home/uchum/work/bk/5.0-opt
88d5d8a2 · gshchepa/uchum@gleb.loc · 5d056de5 · 0bd3dd9a · 88d5d8a2 · 88d5d8a2
Commit 88d5d8a2 authored Jun 20, 2007 by gshchepa/uchum@gleb.loc
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/metadata.result mysql-test/r/metadata.result +1 -1

mysql-test/t/metadata.test mysql-test/t/metadata.test +1 -1

No files found.
--- a/mysql-test/r/metadata.result
+++ b/mysql-test/r/metadata.result
@@ -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
--- a/mysql-test/t/metadata.test
+++ b/mysql-test/t/metadata.test
@@ -109,7 +109,7 @@ SELECT v1.c1, v2.c2 FROM v1 JOIN v2 ON c1=c2 GROUP BY v1.c1;
 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