diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /sql/sql_select.cc | |
| parent | 946dc457facc58517e9c47f1c5ad0029e529da79 (diff) | |
| parent | 32e51de7f58d6f3e82c97fe9ab37d8d8246b762b (diff) | |
| download | mariadb-git-ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3e2d85e4951..22e59239488 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2270,7 +2270,7 @@ JOIN::destroy() tab->cleanup(); } tmp_join->tmp_join= 0; - tmp_table_param.cleanup(); + tmp_table_param.copy_field= 0; DBUG_RETURN(tmp_join->destroy()); } cond_equal= 0; @@ -3330,12 +3330,12 @@ add_key_equal_fields(KEY_FIELD **key_fields, uint and_level, @retval FALSE it's something else */ -inline static bool +static bool is_local_field (Item *field) { - field= field->real_item(); - return field->type() == Item::FIELD_ITEM && - !((Item_field *)field)->depended_from; + return field->real_item()->type() == Item::FIELD_ITEM + && !(field->used_tables() & OUTER_REF_TABLE_BIT) + && !((Item_field *)field->real_item())->depended_from; } |