summaryrefslogtreecommitdiff
path: root/mysql-test/r/metadata.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-06-15 21:48:38 -0700
committerIgor Babaev <igor@askmonty.org>2011-06-15 21:48:38 -0700
commit078b59f5bcb2f4f5d45451a40b798cc92913f7fb (patch)
tree3e1874756e544c0c0c4852ac5a6b3d5fe60b26bd /mysql-test/r/metadata.result
parenta9d73e093aa68351fd6776a892012deffa27fb7d (diff)
parentab411f8f1c2e84082623c038eb024c15c58745b5 (diff)
downloadmariadb-git-078b59f5bcb2f4f5d45451a40b798cc92913f7fb.tar.gz
Merge of mwl #106 into 5.3.
Diffstat (limited to 'mysql-test/r/metadata.result')
-rw-r--r--mysql-test/r/metadata.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/metadata.result b/mysql-test/r/metadata.result
index 09365152f85..fdb020500ee 100644
--- a/mysql-test/r/metadata.result
+++ b/mysql-test/r/metadata.result
@@ -205,7 +205,7 @@ CREATE TABLE t1 (f1 INT);
CREATE VIEW v1 AS SELECT f1 FROM t1;
SELECT f1 FROM v1 va;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def test v1 va f1 f1 3 11 0 Y 32768 0 63
+def test va va f1 f1 3 11 0 Y 32768 0 63
f1
DROP VIEW v1;
DROP TABLE t1;