diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-08-18 19:58:51 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-08-18 19:58:51 -0700 |
| commit | 4eddb2c221d086d7181ef7ff78bb0e6ce6f3359a (patch) | |
| tree | d1b3c7ebc6b5149a4111176c53ce112a7585ae21 /mysql-test/r/join_outer.result | |
| parent | b59738a598569ace75be5e63b7ed6ca69afe6ebc (diff) | |
| parent | 25c152018dceae35bf0d45de46a33a214048128c (diff) | |
| download | mariadb-git-4eddb2c221d086d7181ef7ff78bb0e6ce6f3359a.tar.gz | |
Merge 5.3->5.5.
In particular:
Merged the patch for bug mdev-4418 from 5.3 into 5.5.
Fixed a bug in the patch that should be backported to 5.3.
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 fb4cc58d607..170c6f3eb05 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -1930,7 +1930,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t2 system NULL NULL NULL NULL 1 100.00 2 SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select NULL AS `a` from `test`.`t2` where 1 +Note 1003 select NULL AS `a` from `test`.`t2` DROP TABLE t1,t2,t3; # # LP bug #817384 Wrong result with outer join + subquery in ON |