diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-12 12:51:53 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-12 12:51:53 +0300 |
| commit | dbbdc4b19691711c82e42c4def5f5325759524c4 (patch) | |
| tree | 1d8062b6d5a8ab72361ee3021277a00ca8c6acf1 /mysql-test/r/explain.result | |
| parent | 6e7b8b6a7ab2b58016403304b1c49cf908a6479d (diff) | |
| parent | b182c9bd2030c3b3c548157d1bc4c01c306b2c5c (diff) | |
| download | mariadb-git-dbbdc4b19691711c82e42c4def5f5325759524c4.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/subselect.result
Text conflict in mysql-test/r/subselect3.result
Text conflict in mysql-test/r/type_datetime.result
Text conflict in sql/share/Makefile.am
Diffstat (limited to 'mysql-test/r/explain.result')
| -rw-r--r-- | mysql-test/r/explain.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/explain.result b/mysql-test/r/explain.result index 4ca4a8dde9d..9740303c00e 100644 --- a/mysql-test/r/explain.result +++ b/mysql-test/r/explain.result @@ -224,7 +224,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: Note 1276 Field or reference 'test.t1.c' of SELECT #2 was resolved in SELECT #1 -Note 1003 select (select 1 AS `1` from `test`.`t2` where (`test`.`t2`.`d` = NULL)) AS `(SELECT 1 FROM t2 WHERE d = c)` from dual +Note 1003 select (select 1 from `test`.`t2` where (`test`.`t2`.`d` = NULL)) AS `(SELECT 1 FROM t2 WHERE d = c)` from dual DROP TABLE t1, t2; # # Bug#30302: Tables that were optimized away are printed in the |