diff --git a/sql/item_func.h b/sql/item_func.h index e59fd4abfea4b83c35663515ccd5c3dda45053fc..fd1a1eeb3fa06a465b5752ae2003005fb200bcad 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -447,8 +447,6 @@ class Item_func_hybrid_field_type: public Item_hybrid_func DBUG_ASSERT((res != NULL) ^ null_value); return res; } -protected: - Item_result cached_result_type; public: Item_func_hybrid_field_type(THD *thd): diff --git a/sql/sp_head.cc b/sql/sp_head.cc index f04821eba244fd402d0b70090243458fd7c0441b..0b95123c7d930d98539561ea3550a1f43a90f275 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -70,28 +70,6 @@ static void reset_start_time_for_sp(THD *thd) thd->set_start_time(); } -Item_result -sp_map_result_type(enum enum_field_types type) -{ - switch (type) { - case MYSQL_TYPE_BIT: - case MYSQL_TYPE_TINY: - case MYSQL_TYPE_SHORT: - case MYSQL_TYPE_LONG: - case MYSQL_TYPE_LONGLONG: - case MYSQL_TYPE_INT24: - return INT_RESULT; - case MYSQL_TYPE_DECIMAL: - case MYSQL_TYPE_NEWDECIMAL: - return DECIMAL_RESULT; - case MYSQL_TYPE_FLOAT: - case MYSQL_TYPE_DOUBLE: - return REAL_RESULT; - default: - return STRING_RESULT; - } -} - Item::Type sp_map_item_type(enum enum_field_types type) diff --git a/sql/sp_head.h b/sql/sp_head.h index f2a02702ecf1ccc2849466dd9a68cd2ff21d9b09..4e761c31d5b328bfd4475581ab808a4621194d43 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -45,9 +45,6 @@ //#define TYPE_ENUM_FUNCTION 1 #define TYPE_ENUM_PROCEDURE 2 #define //TYPE_ENUM_TRIGGER 3 #define TYPE_ENUM_PROXY 4 -Item_result -sp_map_result_type(enum enum_field_types type); - Item::Type sp_map_item_type(enum enum_field_types type);