At file:///home/psergey/dev/maria-5.3-subqueries-r10/ ------------------------------------------------------------ revno: 2783 revision-id: psergey@askmonty.org-20100321195033-jzl1l091k2nbb6zh parent: psergey@askmonty.org-20100320165930-ehfull9rin1bdme4 committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.3-subqueries-r10 timestamp: Sun 2010-03-21 22:50:33 +0300 message: Fix merge error in pbxt suite test results === modified file 'mysql-test/suite/pbxt/r/join_nested.result' --- a/mysql-test/suite/pbxt/r/join_nested.result 2010-03-20 12:01:47 +0000 +++ b/mysql-test/suite/pbxt/r/join_nested.result 2010-03-21 19:50:33 +0000 @@ -1055,8 +1055,8 @@ (t8.b=t9.b OR t8.c IS NULL) AND (t9.a=1); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t0 ref idx_a idx_a 5 const 1 100.00 -1 SIMPLE t1 ref idx_b idx_b 5 test.t0.b 1 100.00 +1 SIMPLE t0 ref idx_a idx_a 5 const 1 +1 SIMPLE t1 ref idx_b idx_b 5 test.t0.b 1 1 SIMPLE t2 ALL NULL NULL NULL NULL 3 1 SIMPLE t3 ALL NULL NULL NULL NULL 2 1 SIMPLE t4 ref idx_b idx_b 5 test.t2.b 1