diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-15 10:26:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-15 10:26:08 +0400 |
| commit | a9240dce9e2f32941611b4f1a52e3b30a1508fc2 (patch) | |
| tree | ab7a7ec71341e29676d9a6bb039aeface4f88ce6 /sql/sql_derived.cc | |
| parent | 2c0a073970cf5f1dc679b34bb13e7fc55109dfd0 (diff) | |
| parent | eb2c6f451392396ef2ca74f1dba761fc4459d171 (diff) | |
| download | mariadb-git-a9240dce9e2f32941611b4f1a52e3b30a1508fc2.tar.gz | |
Merge 10.0-base -> 10.0
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 9f507df3767..86587280d03 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(); |