diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-10-13 13:43:29 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-10-13 13:43:29 -0700 |
| commit | c7db46a2427e933a379d0a8c62221c344a29ea06 (patch) | |
| tree | 9b18bd0d93bea6517341827cfd02540054633174 /sql/sql_derived.cc | |
| parent | e37639e9349b56296d452e69e970df939383d7e1 (diff) | |
| parent | 78b580b77965d63d4292a72a3ba12d0cc83b01a3 (diff) | |
| download | mariadb-git-c7db46a2427e933a379d0a8c62221c344a29ea06.tar.gz | |
Merge 5.3-5.5
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 44cb270c884..bb55451e9dc 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -395,8 +395,6 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived) if (dt_select->options & OPTION_SCHEMA_TABLE) parent_lex->options |= OPTION_SCHEMA_TABLE; - parent_lex->cond_count+= dt_select->cond_count; - if (!derived->get_unit()->prepared) { dt_select->leaf_tables.empty(); |