diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-03-28 19:18:36 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-03-28 19:18:36 -0700 |
| commit | e06c207643b72dad922bf0ddcec8b2afc1bb7ed0 (patch) | |
| tree | 60c5d34deb703538ebd6ed5f8456e3025160917e /sql/sql_select.cc | |
| parent | 67a307ace738b24695cb4500dc561ac9aaaedc5d (diff) | |
| parent | 8c55efee29fa5fb3fca5cbb2423ebb16754116d0 (diff) | |
| download | mariadb-git-e06c207643b72dad922bf0ddcec8b2afc1bb7ed0.tar.gz | |
Merge 5.3->5.5.
Diffstat (limited to 'sql/sql_select.cc')
| -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 73759c9a0ce..c84c4156d2a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -12853,9 +12853,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 |