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/view.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/view.result')
| -rw-r--r-- | mysql-test/r/view.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 1d9f8a84e24..c1f1f0cb3b5 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -117,7 +117,7 @@ c 12 explain extended select c from v5; id select_type table type possible_keys key key_len ref rows filtered Extra -1 PRIMARY <derived3> ALL NULL NULL NULL NULL 5 100.00 +1 SIMPLE <derived3> ALL NULL NULL NULL NULL 5 100.00 3 DERIVED t1 ALL NULL NULL NULL NULL 5 100.00 Warnings: Note 1003 select (`v2`.`c` + 1) AS `c` from `test`.`v2` @@ -237,7 +237,7 @@ a 3 explain select * from v1; id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY <derived2> ALL NULL NULL NULL NULL 3 +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 6 2 DERIVED t1 ALL NULL NULL NULL NULL 6 Using temporary select * from t1; a @@ -302,7 +302,7 @@ a+1 4 explain select * from v1; id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY <derived2> ALL NULL NULL NULL NULL 2 +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 4 2 DERIVED t1 ALL NULL NULL NULL NULL 4 Using filesort drop view v1; drop table t1; |