Merge bk-internal:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged

4 files changed, 4 insertions, 4 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 90f42cee959..125c8de2275 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -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;
   LINT_INIT(res);
diff --git a/sql/item_create.h b/sql/item_create.h
index 4151f59a87f..5646afb991e 100644
--- a/sql/item_create.h
+++ b/sql/item_create.h
@@ -28,7 +28,7 @@ Item *create_func_bit_length(Item* a);
 Item *create_func_coercibility(Item* a);
 Item *create_func_ceiling(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_conv(Item* a, Item *b, Item *c);
 Item *create_func_cos(Item* a);
diff --git a/sql/item_func.h b/sql/item_func.h
index a5575a35851..cb3869bd7cc 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1084,7 +1084,7 @@ public:
 
 /* For type casts */
 
-enum Item_cast
+enum Cast_target
 {
   ITEM_CAST_BINARY, ITEM_CAST_SIGNED_INT, ITEM_CAST_UNSIGNED_INT,
   ITEM_CAST_DATE, ITEM_CAST_TIME, ITEM_CAST_DATETIME, ITEM_CAST_CHAR
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 6072be28dca..7a16cb4fc56 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -74,7 +74,7 @@ inline Item *or_or_concat(THD *thd, Item* A, Item* B)
   enum row_type row_type;
   enum ha_rkey_function ha_rkey_mode;
   enum enum_tx_isolation tx_isolation;
-  enum Item_cast cast_type;
+  enum Cast_target cast_type;
   enum Item_udftype udf_type;
   CHARSET_INFO *charset;
   thr_lock_type lock_type;