diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-09-28 16:48:40 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-09-28 16:48:40 +0300 |
| commit | 7aece82ceb9c199e5e1e20950089877d1e6f6cc2 (patch) | |
| tree | 56582463c3673d55220120abb3ed44b0bc0b93f4 /sql/sql_select.cc | |
| parent | 41a2f90ba4d28b7604d1c57f107fa1e474d4b3b9 (diff) | |
| parent | 5dda6c18cdb6b549681f76b6158baa3afd2816bb (diff) | |
| download | mariadb-git-7aece82ceb9c199e5e1e20950089877d1e6f6cc2.tar.gz | |
merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1ff068c8881..3f1432914a0 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3308,12 +3308,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; } |