diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 13:57:21 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 13:57:21 +0200 |
commit | fbab0685a7b7f39db0217823ad90dd47034eae29 (patch) | |
tree | 11baae52acdb6c3300d8fe37eb804920ac172960 /sql/item.h | |
parent | 67a3ddf17abfd182b99e16cc539dc72be5da707b (diff) | |
download | mariadb-git-fbab0685a7b7f39db0217823ad90dd47034eae29.tar.gz |
post-merge changes, fixes, and tests
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/item.h b/sql/item.h index 458db5e0174..ac4fa866349 100644 --- a/sql/item.h +++ b/sql/item.h @@ -4103,11 +4103,7 @@ 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; } |