summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-02-24 20:07:12 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-02-24 20:07:12 +0400
commit2256ecdd7cfaccec4f081f48bb361e7e9a008263 (patch)
tree6812095b7c11a26f6cc101408241413a4b024fa5 /sql/sql_select.cc
parentd206480605cdf70925ba10897ee5856d7c0920ec (diff)
parent0919edf32d29b9371288ce1a5f4e03f051bb8093 (diff)
downloadmariadb-git-2256ecdd7cfaccec4f081f48bb361e7e9a008263.tar.gz
Merge 5.2->5.3
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index cb3590756df..84fbad710d7 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12274,6 +12274,7 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top,
tbl->table->maybe_null= FALSE;
tbl->join_list= table->join_list;
repl_list.push_back(tbl);
+ tbl->dep_tables|= table->dep_tables;
}
li.replace(repl_list);
/* Need to update the name resolution table chain when flattening joins */