diff options
Diffstat (limited to 'sql/item_row.h')
| -rw-r--r-- | sql/item_row.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index d7326df04ce..83e9743fede 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -53,6 +53,7 @@ public: { } enum Type type() const { return ROW_ITEM; }; + const Type_handler *type_handler() const { return &type_handler_row; } void illegal_method_call(const char *); bool is_null() { return null_value; } void make_field(THD *thd, Send_field *) @@ -86,13 +87,6 @@ public: List<Item> &fields, uint flags); table_map used_tables() const { return used_tables_cache; }; bool const_item() const { return const_item_cache; }; - enum Item_result result_type() const { return ROW_RESULT; } - Item_result cmp_type() const { return ROW_RESULT; } - enum_field_types field_type() const - { - DBUG_ASSERT(0); - return MYSQL_TYPE_DOUBLE; - } void update_used_tables() { used_tables_and_const_cache_init(); @@ -110,7 +104,7 @@ public: Item *transform(THD *thd, Item_transformer transformer, uchar *arg); bool eval_not_null_tables(void *opt_arg); - uint cols() { return arg_count; } + uint cols() const { return arg_count; } Item* element_index(uint i) { return args[i]; } Item** addr(uint i) { return args + i; } bool check_cols(uint c); |