diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
| commit | f03a3ee54fb8b5aeeba590677f48b54a57ab45cf (patch) | |
| tree | afb1235c5417019a563b1c1d64443f3b890d05df /mysql-test/r/metadata.result | |
| parent | f0f2ec3086000a22e83ce9ca33d59a3347784e0c (diff) | |
| parent | 35c35858f859f23c23a414cdb21fdfe39d5de11c (diff) | |
| download | mariadb-git-f03a3ee54fb8b5aeeba590677f48b54a57ab45cf.tar.gz | |
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
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 e209193a2c0..19bd7089c49 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; |