#At lp:maria based on revid:psergey@askmonty.org-20090616204358-yjkyfxczsomrn9yn 2717 Sergey Petrunia 2009-06-17 * Use excessive parentheses to stop compiler warning * Fix test results to account for changes in previous cset modified: mysql-test/r/select.result sql/sql_select.cc per-file messages: mysql-test/r/select.result * Use excessive parentheses to stop compiler warning * Fix test results to account for changes in previous cset sql/sql_select.cc * Use excessive parentheses to stop compiler warning * Fix test results to account for changes in previous cset === modified file 'mysql-test/r/select.result' --- a/mysql-test/r/select.result 2009-03-16 05:02:10 +0000 +++ b/mysql-test/r/select.result 2009-06-17 05:27:39 +0000 @@ -3585,7 +3585,6 @@ INSERT INTO t2 VALUES (1,'a'),(2,'b'),(3 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)); === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2009-06-16 19:54:13 +0000 +++ b/sql/sql_select.cc 2009-06-17 05:27:39 +0000 @@ -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; }