diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-02-03 17:15:22 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-02-06 13:36:17 +0100 |
| commit | 41021c0254207c914e271fc4dfc910093dd4a92d (patch) | |
| tree | 266e75202bb02b9068205809c105e37ead45fd4f /sql/sql_view.cc | |
| parent | ad94790f468bacb2cd62d02d3a6e7f012ca72e65 (diff) | |
| download | mariadb-git-41021c0254207c914e271fc4dfc910093dd4a92d.tar.gz | |
MDEV-9462: Out of memory using explain on 2 empty tables
Fixed adding derived tables items to outer one.
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index e6c5ffddfcf..5bd82fdd842 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1523,8 +1523,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, /* Fields in this view can be used in upper select in case of merge. */ if (table->select_lex) - table->select_lex->select_n_where_fields+= - lex->select_lex.select_n_where_fields; + table->select_lex->add_where_field(&lex->select_lex); } /* This method has a dependency on the proper lock type being set, |