Skip to content

M
mariadb
Commit 88d5d8a2 authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files
Options

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

into  gleb.loc:/home/uchum/work/bk/5.0-opt
parents 5d056de5 0bd3dd9a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/r/metadata.result
View file @ 88d5d8a2
...@@ -179,6 +179,6 @@ c1 c2 ...@@ -179,6 +179,6 @@ c1 c2
1 1 1 1
2 2 2 2
3 3 3 3
DROP VIEW v1; DROP VIEW v1,v2;
DROP TABLE t1,t2; DROP TABLE t1,t2;
End of 5.0 tests End of 5.0 tests
mysql-test/t/metadata.test
View file @ 88d5d8a2
...@@ -109,7 +109,7 @@ SELECT v1.c1, v2.c2 FROM v1 JOIN v2 ON c1=c2 GROUP BY v1.c1; ...@@ -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; SELECT v1.c1, v2.c2 FROM v1 JOIN v2 ON c1=c2 GROUP BY v1.c1 ORDER BY v2.c2;
--disable_metadata --disable_metadata
DROP VIEW v1; DROP VIEW v1,v2;
DROP TABLE t1,t2; DROP TABLE t1,t2;
--echo End of 5.0 tests --echo End of 5.0 tests
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7