mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Use excessive parentheses to stop compiler warning

Browse source 
* Fix test results to account for changes in previous cset
This commit is contained in:
Sergey Petrunia 2009-06-17 09:27:39 +04:00
parent c0103f705c
commit 7a9f45c6d5
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/select.result
View file

@ -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));

6
sql/sql_select.cc
View file

@ -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;
} }