diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-07-18 22:36:20 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-07-18 22:36:20 +0400 |
| commit | 33e961c1abbf7d401a6f3ae5c04ff312b433ca3a (patch) | |
| tree | dd03578718b29dbb8436f93de4396e936d9f5aef /sql/table.cc | |
| parent | 82f821ee8f7d8b55674115f64e344299ef28bfe5 (diff) | |
| parent | 1b84c0cfee4db6f0a6c97459a47444ed1f0d6ce1 (diff) | |
| download | mariadb-git-33e961c1abbf7d401a6f3ae5c04ff312b433ca3a.tar.gz | |
Merge bug#1007622 from 5.3 to 5.5
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 2a11098caed..b8161093e9a 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4544,7 +4544,14 @@ bool TABLE_LIST::check_single_table(TABLE_LIST **table_arg, tbl; tbl= tbl->next_local) { - if (tbl->table) + /* + Merged view has also temporary table attached (in 5.2 if it has table + then it was real table), so we have filter such temporary tables out + by checking that it is not merged view + */ + if (tbl->table && + !(tbl->is_view() && + tbl->is_merged_derived())) { if (tbl->table->map & map) { |