diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-09-23 08:10:53 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-09-23 08:10:53 -0700 |
| commit | b969df8bbdc6acbaf1506b52346d24306e84a48c (patch) | |
| tree | b0b9eaa82a121c87f17487c57926bd9968d3ef20 /mysql-test/r/metadata.result | |
| parent | cfbd9270243e4b429cdc26e8554bcc99690f2422 (diff) | |
| parent | 709a0a131021135e9fb7a2095fcfcbc223dfb126 (diff) | |
| download | mariadb-git-b969df8bbdc6acbaf1506b52346d24306e84a48c.tar.gz | |
Merge of the mwl106 tree into the latest 5.3 tree.
Resolved conflicts. Adjusted some test results
Diffstat (limited to 'mysql-test/r/metadata.result')
| -rw-r--r-- | mysql-test/r/metadata.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/metadata.result b/mysql-test/r/metadata.result index 2f9fb6b67f5..2f9eaadf837 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; |