diff options
author | Igor Babaev <igor@askmonty.org> | 2013-03-27 08:58:16 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2013-03-27 08:58:16 -0700 |
commit | d4de82d93e58a74172960853b07c717377f57e6b (patch) | |
tree | 204966cc6cbab644866411659b56b9e02d319045 /sql | |
parent | e308d7417bc4ceb1b3b72cac2642015b88f310ff (diff) | |
parent | 21dad7ec302e600c9d056fd7b73913be83cf7f9b (diff) | |
download | mariadb-git-d4de82d93e58a74172960853b07c717377f57e6b.tar.gz |
Merge.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f05918f0001..e0a670bdf1c 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -12580,9 +12580,6 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top, table->prep_on_expr= table->on_expr= 0; } } - - if (!top) - continue; /* Only inner tables of non-convertible outer joins |