At file:///home/psergey/dev/maria-5.2-dsmrr-r3/ ------------------------------------------------------------ revno: 2743 revision-id: psergey@askmonty.org-20091227202422-fs9fgo8x2wk9ry15 parent: igor@askmonty.org-20091222151849-rqp41x6x9r14liz6 committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.2-dsmrr-r3 timestamp: Sun 2009-12-27 23:24:22 +0300 message: DS-MRR backport: fix buildbot valgrind failures: - Do call update_used_tables() for new conditions obtained when adding outer join's triggered conditions. Correct values of used_tables() are now needed for condition pushdown. - Update test results === modified file 'mysql-test/suite/pbxt/r/join_outer.result' --- a/mysql-test/suite/pbxt/r/join_outer.result 2009-12-16 09:28:51 +0000 +++ b/mysql-test/suite/pbxt/r/join_outer.result 2009-12-27 20:24:22 +0000 @@ -886,7 +886,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t0 const PRIMARY PRIMARY 4 const 1 Using index 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 Using index -1 SIMPLE t2 ALL NULL NULL NULL NULL 2 +1 SIMPLE t2 ALL NULL NULL NULL NULL 2 Using where 1 SIMPLE t3 ALL NULL NULL NULL NULL 2 drop table t1,t2; create table t1 (a int, b int); === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2009-12-21 02:26:15 +0000 +++ b/sql/sql_select.cc 2009-12-27 20:24:22 +0000 @@ -6201,6 +6201,7 @@ cond_tab->set_select_cond(new_cond, __LINE__); if (!cond_tab->select_cond) DBUG_RETURN(1); + cond_tab->select_cond->update_used_tables(); cond_tab->select_cond->quick_fix_field(); } } @@ -6482,6 +6483,7 @@ if (!cond_tab->select_cond) DBUG_RETURN(1); cond_tab->select_cond->quick_fix_field(); + cond_tab->select_cond->update_used_tables(); if (cond_tab->select) cond_tab->select->cond= cond_tab->select_cond; } @@ -6537,6 +6539,7 @@ (ulong)cond_tab->select_cond)); if (!cond_tab->select_cond) DBUG_RETURN(1); + cond_tab->select_cond->update_used_tables(); cond_tab->select_cond->quick_fix_field(); if (cond_tab->select) cond_tab->select->cond= cond_tab->select_cond;