mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/sql_yacc.yy: Auto merged
This commit is contained in:
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user