Commit e11efbdd authored by serg@serg.mylan's avatar serg@serg.mylan

renamed enum Item_cast as it's not a 'class Item' child

parent 647dbdf6
...@@ -470,7 +470,7 @@ Item *create_load_file(Item* a) ...@@ -470,7 +470,7 @@ Item *create_load_file(Item* a)
} }
Item *create_func_cast(Item *a, Item_cast cast_type, CHARSET_INFO *cs) Item *create_func_cast(Item *a, Cast_target cast_type, CHARSET_INFO *cs)
{ {
Item *res; Item *res;
LINT_INIT(res); LINT_INIT(res);
......
...@@ -28,7 +28,7 @@ Item *create_func_bit_length(Item* a); ...@@ -28,7 +28,7 @@ Item *create_func_bit_length(Item* a);
Item *create_func_coercibility(Item* a); Item *create_func_coercibility(Item* a);
Item *create_func_ceiling(Item* a); Item *create_func_ceiling(Item* a);
Item *create_func_char_length(Item* a); Item *create_func_char_length(Item* a);
Item *create_func_cast(Item *a, Item_cast cast_type, CHARSET_INFO *cs); Item *create_func_cast(Item *a, Cast_target cast_type, CHARSET_INFO *cs);
Item *create_func_connection_id(void); Item *create_func_connection_id(void);
Item *create_func_conv(Item* a, Item *b, Item *c); Item *create_func_conv(Item* a, Item *b, Item *c);
Item *create_func_cos(Item* a); Item *create_func_cos(Item* a);
......
...@@ -1081,7 +1081,7 @@ class Item_func_is_used_lock :public Item_int_func ...@@ -1081,7 +1081,7 @@ class Item_func_is_used_lock :public Item_int_func
/* For type casts */ /* For type casts */
enum Item_cast enum Cast_target
{ {
ITEM_CAST_BINARY, ITEM_CAST_SIGNED_INT, ITEM_CAST_UNSIGNED_INT, ITEM_CAST_BINARY, ITEM_CAST_SIGNED_INT, ITEM_CAST_UNSIGNED_INT,
ITEM_CAST_DATE, ITEM_CAST_TIME, ITEM_CAST_DATETIME, ITEM_CAST_CHAR ITEM_CAST_DATE, ITEM_CAST_TIME, ITEM_CAST_DATETIME, ITEM_CAST_CHAR
......
...@@ -74,7 +74,7 @@ inline Item *or_or_concat(THD *thd, Item* A, Item* B) ...@@ -74,7 +74,7 @@ inline Item *or_or_concat(THD *thd, Item* A, Item* B)
enum row_type row_type; enum row_type row_type;
enum ha_rkey_function ha_rkey_mode; enum ha_rkey_function ha_rkey_mode;
enum enum_tx_isolation tx_isolation; enum enum_tx_isolation tx_isolation;
enum Item_cast cast_type; enum Cast_target cast_type;
enum Item_udftype udf_type; enum Item_udftype udf_type;
CHARSET_INFO *charset; CHARSET_INFO *charset;
thr_lock_type lock_type; thr_lock_type lock_type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment