diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-07-18 20:05:33 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-07-18 20:05:33 -0700 |
| commit | f392edab02731723edb7386b301065e571df9bf3 (patch) | |
| tree | a668192badd42f25ea71ae5f72e5675bf51af44c /sql/sql_derived.cc | |
| parent | cc0195d6a1e603c3ebef91af16a1e1c33dff4a2e (diff) | |
| download | mariadb-git-f392edab02731723edb7386b301065e571df9bf3.tar.gz | |
Fixed valgrind problems of the patch for bug 794901.
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index e3de7d9c2dd..a45b8b05a82 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -478,11 +478,7 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived) if (derived->merged_for_insert) return FALSE; if (derived->is_materialized_derived()) - { - bool res= mysql_derived_prepare(thd, lex, derived); - derived->select_lex->leaf_tables.push_back(derived); - return res; - } + return mysql_derived_prepare(thd, lex, derived); if (!derived->is_multitable()) { if (!derived->updatable) |