From 7a9f45c6d5fc90a18c44e52ddd147e95fdacc264 Mon Sep 17 00:00:00 2001 From: Sergey Petrunia Date: Wed, 17 Jun 2009 09:27:39 +0400 Subject: [PATCH] * Use excessive parentheses to stop compiler warning * Fix test results to account for changes in previous cset --- mysql-test/r/select.result | 1 - sql/sql_select.cc | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 0771c7fb370..1dcc1cb54d1 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -3585,7 +3585,6 @@ INSERT INTO t2 VALUES (1,'a'),(2,'b'),(3,'c'); EXPLAIN SELECT t1.a FROM t1 LEFT JOIN t2 ON t2.b=t1.b WHERE t1.a=3; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 -1 SIMPLE t2 const b b 22 const 1 Using index DROP TABLE t1,t2; CREATE TABLE t1(id int PRIMARY KEY, b int, e int); CREATE TABLE t2(i int, a int, INDEX si(i), INDEX ai(a)); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b460ee05ae8..dbc300adae0 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -16963,9 +16963,9 @@ static void print_join(THD *thd, CREATE VIEW. There we'll have nested_join->used_tables==0. */ if (eliminated_tables && // (*) - (curr->table && (curr->table->map & eliminated_tables) || - curr->nested_join && !(curr->nested_join->used_tables & - ~eliminated_tables))) + ((curr->table && (curr->table->map & eliminated_tables)) || + (curr->nested_join && !(curr->nested_join->used_tables & + ~eliminated_tables)))) { continue; }