diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
| commit | 40e94a3734b1daa254810c4be64e17b84dbbc2a2 (patch) | |
| tree | 5e14dfc106276445caf85dc76c8034c8b0df11b4 /sql/item.cc | |
| parent | 247e654fa7e04dd0c5181c2241470f56749d2a99 (diff) | |
| parent | 4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff) | |
| download | mariadb-git-40e94a3734b1daa254810c4be64e17b84dbbc2a2.tar.gz | |
merge with 5.5
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index 13a4524f131..216ef628271 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -6837,7 +6837,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference) if (from_field != not_found_field) { Item_field* fld; - if (!(fld= new Item_field(thd, last_checked_context, from_field))) + if (!(fld= new Item_field(from_field))) goto error; thd->change_item_tree(reference, fld); mark_as_dependent(thd, last_checked_context->select_lex, @@ -9607,7 +9607,7 @@ table_map Item_direct_view_ref::used_tables() const { return get_depended_from() ? OUTER_REF_TABLE_BIT : - ((view->merged || !view->table) ? + ((view->is_merged_derived() || view->merged || !view->table) ? (*ref)->used_tables() : view->table->map); } @@ -9616,7 +9616,7 @@ table_map Item_direct_view_ref::not_null_tables() const { return get_depended_from() ? 0 : - ((view->merged || !view->table) ? + ((view->is_merged_derived() || view->merged || !view->table) ? (*ref)->not_null_tables() : view->table->map); } |