diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
| commit | 0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb (patch) | |
| tree | 5af5b81499f6137f45a37fc77cc518e40fd4ad72 /sql/item.h | |
| parent | e4df6e5799eec20a16e279f7e74e95f18cd475fe (diff) | |
| parent | e02fe87f00dc9fdb0fb6ab13f2e87485f79f3341 (diff) | |
| download | mariadb-git-0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 2d7236615a8..458db5e0174 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1,8 +1,8 @@ #ifndef SQL_ITEM_INCLUDED #define SQL_ITEM_INCLUDED -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2013 Monty Program Ab. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. + Copyright (c) 2009, 2015 Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4103,7 +4103,11 @@ public: collation.set(item->collation); unsigned_flag= item->unsigned_flag; if (item->type() == FIELD_ITEM) + { cached_field= ((Item_field *)item)->field; + if (cached_field->table) + used_table_map= cached_field->table->map; + } return 0; }; enum Type type() const { return CACHE_ITEM; } |