From 6777a11b2451f512321f057e43d80f88c1c6e116 Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Sun, 21 Mar 2010 22:50:33 +0300 Subject: [PATCH] Fix merge error in pbxt suite test results --- mysql-test/suite/pbxt/r/join_nested.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/pbxt/r/join_nested.result b/mysql-test/suite/pbxt/r/join_nested.result index 8599ab9e96a..9755db50fde 100644 --- a/mysql-test/suite/pbxt/r/join_nested.result +++ b/mysql-test/suite/pbxt/r/join_nested.result @@ -1055,8 +1055,8 @@ t0.b=t1.b AND (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