diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-06-09 07:36:24 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-06-09 07:36:24 +0400 |
| commit | b1e10399f4ec7a37f432c33e1c94e21c1f74f30b (patch) | |
| tree | 4a68f0f5fda33f180c90354a1f820a5f8bf227da | |
| parent | a4d93e07cc885fbdcef9797b44ddb096d841883f (diff) | |
| download | mariadb-git-b1e10399f4ec7a37f432c33e1c94e21c1f74f30b.tar.gz | |
MDEV-8286 Likely a redundant declaration of Item_cache::used_table_map
Removing Item_cache::used_table_map, Item_cache::used_tables() and
Item_cache::set_used_tables(). Using the same inherited from
Item_basic_constant implementations instead.
| -rw-r--r-- | sql/item.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/item.h b/sql/item.h index 8bd5751c6e4..4aaa67d9a1d 100644 --- a/sql/item.h +++ b/sql/item.h @@ -4056,7 +4056,6 @@ class Item_cache: public Item_basic_constant { protected: Item *example; - table_map used_table_map; /** Field that this object will get value from. This is used by index-based subquery engines to detect and remove the equality injected @@ -4074,7 +4073,7 @@ protected: bool value_cached; public: Item_cache(): - example(0), used_table_map(0), cached_field(0), + example(0), cached_field(0), cached_field_type(MYSQL_TYPE_STRING), value_cached(0) { @@ -4083,7 +4082,7 @@ public: null_value= 1; } Item_cache(enum_field_types field_type_arg): - example(0), used_table_map(0), cached_field(0), + example(0), cached_field(0), cached_field_type(field_type_arg), value_cached(0) { @@ -4092,8 +4091,6 @@ public: null_value= 1; } - void set_used_tables(table_map map) { used_table_map= map; } - virtual bool allocate(uint i) { return 0; } virtual bool setup(Item *item) { @@ -4110,7 +4107,6 @@ public: enum_field_types field_type() const { return cached_field_type; } static Item_cache* get_cache(const Item *item); static Item_cache* get_cache(const Item* item, const Item_result type); - table_map used_tables() const { return used_table_map; } virtual void keep_array() {} virtual void print(String *str, enum_query_type query_type); bool eq_def(Field *field) |