database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

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

Browse Source 
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:
unknown
2003-07-14 10:54:22 +02:00
parent f1e3a929e8 4efcd17029
commit bc17b14d94
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_create.cc
View File

@@ -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);

2
sql/item_create.h
View File

@@ -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);

2
sql/item_func.h
View File

@@ -1084,7 +1084,7 @@ public:
/* 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

2
sql/sql_yacc.yy
View File

@@ -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;