diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-29 07:24:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-29 07:24:05 +0400 |
| commit | fb43180c4f46bccaee054524ff532dea4bef41d4 (patch) | |
| tree | 7d53d19866b749debb71b7d4979800ecbef44bdd /sql/sql_derived.cc | |
| parent | 48c59f394bb9bd4dfd34be19ff4cf933557eb017 (diff) | |
| parent | c5520a37d6111991157d8da91b1ae4b9e7cbf50c (diff) | |
| download | mariadb-git-fb43180c4f46bccaee054524ff532dea4bef41d4.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index ca5a96591ad..2e070827505 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -790,9 +790,12 @@ exit: */ if (res) { - if (derived->table && !derived->is_with_table_recursive_reference()) - free_tmp_table(thd, derived->table); - delete derived->derived_result; + if (!derived->is_with_table_recursive_reference()) + { + if (derived->table) + free_tmp_table(thd, derived->table); + delete derived->derived_result; + } } else { |