summaryrefslogtreecommitdiff
path: root/sql/opt_table_elimination.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-12 18:08:12 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-12 18:08:12 +0100
commit557f0d3ad04111e274d709de5fd9879961772210 (patch)
treed7d1767519b4631349ca244a988478f808163919 /sql/opt_table_elimination.cc
parentdb0aed93482759844af7b39c9bf6e7fe141f28f6 (diff)
parent27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (diff)
downloadmariadb-git-557f0d3ad04111e274d709de5fd9879961772210.tar.gz
5.2->5.3 merge
Diffstat (limited to 'sql/opt_table_elimination.cc')
-rw-r--r--sql/opt_table_elimination.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/opt_table_elimination.cc b/sql/opt_table_elimination.cc
index 56396181619..545001c9df1 100644
--- a/sql/opt_table_elimination.cc
+++ b/sql/opt_table_elimination.cc
@@ -693,6 +693,8 @@ eliminate_tables_for_list(JOIN *join, List<TABLE_LIST> *join_list,
{
table_map outside_used_tables= tables_used_elsewhere |
tables_used_on_left;
+ if (on_expr)
+ outside_used_tables |= on_expr->used_tables();
if (tbl->nested_join)
{
/* This is "... LEFT JOIN (join_nest) ON cond" */