diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 22:47:29 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 22:47:29 +0100 |
commit | 213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a (patch) | |
tree | 79e9a941a078d73ce85da0241871a863fa4eca38 /mysql-test/r/join_outer.result | |
parent | cfa94b4338b5dd5578436df0402b2f2210de3eaa (diff) | |
parent | c4341d50950224bb4e976fd1aac23dddc7d78f71 (diff) | |
download | mariadb-git-213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a.tar.gz |
5.3->5.5 merge
Diffstat (limited to 'mysql-test/r/join_outer.result')
-rw-r--r-- | mysql-test/r/join_outer.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index fd2a948847c..c28887d4ff2 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -2008,7 +2008,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 100.00 1 SIMPLE t2 const PRIMARY PRIMARY 4 const 1 100.00 Using index Warnings: -Note 1003 select 5 AS `pk` from `test`.`t2` join `test`.`t1` where (1) order by 5 +Note 1003 select 5 AS `pk` from `test`.`t2` join `test`.`t1` where 1 order by 5 SELECT t1.pk FROM t2 JOIN t1 ON t2.pk = t1.a WHERE t1.b BETWEEN 5 AND 6 AND t1.pk IS NULL OR t1.pk = 5 ORDER BY t1.pk; |