Commit 7a9f45c6 authored by Sergey Petrunia's avatar Sergey Petrunia

* Use excessive parentheses to stop compiler warning

* Fix test results to account for changes in previous cset
parent c0103f70
...@@ -3585,7 +3585,6 @@ INSERT INTO t2 VALUES (1,'a'),(2,'b'),(3,'c'); ...@@ -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; 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 id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1
1 SIMPLE t2 const b b 22 const 1 Using index
DROP TABLE t1,t2; DROP TABLE t1,t2;
CREATE TABLE t1(id int PRIMARY KEY, b int, e int); CREATE TABLE t1(id int PRIMARY KEY, b int, e int);
CREATE TABLE t2(i int, a int, INDEX si(i), INDEX ai(a)); CREATE TABLE t2(i int, a int, INDEX si(i), INDEX ai(a));
......
...@@ -16963,9 +16963,9 @@ static void print_join(THD *thd, ...@@ -16963,9 +16963,9 @@ static void print_join(THD *thd,
CREATE VIEW. There we'll have nested_join->used_tables==0. CREATE VIEW. There we'll have nested_join->used_tables==0.
*/ */
if (eliminated_tables && // (*) if (eliminated_tables && // (*)
(curr->table && (curr->table->map & eliminated_tables) || ((curr->table && (curr->table->map & eliminated_tables)) ||
curr->nested_join && !(curr->nested_join->used_tables & (curr->nested_join && !(curr->nested_join->used_tables &
~eliminated_tables))) ~eliminated_tables))))
{ {
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment