diff options
| author | unknown <serg@serg.mylan> | 2003-07-06 21:36:59 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-07-06 21:36:59 +0200 |
| commit | 4efcd170299000785ee9ce9c25ff72b88965aa45 (patch) | |
| tree | 297b425389ec846d39d4d4e0ac9a739616b02da5 /sql/item_create.cc | |
| parent | cd3e15a6f998a74c0f04560bd8243a04e3218d66 (diff) | |
| parent | aa1b02400e9915643f240960587006e20b286074 (diff) | |
| download | mariadb-git-4efcd170299000785ee9ce9c25ff72b88965aa45.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/item_func.h:
Auto merged
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 2 |
1 files changed, 1 insertions, 1 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); |