diff options
| author | unknown <serg@serg.mylan> | 2003-07-14 10:54:22 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-07-14 10:54:22 +0200 |
| commit | bc17b14d94ada8c0510c799c3e66e70e698579c1 (patch) | |
| tree | e4767938c18fb77cb11d67dba3f00e4271f2d737 /sql/item_create.cc | |
| parent | f1e3a929e844d13bd1e2e51aba19ccc0ea5659a5 (diff) | |
| parent | 4efcd170299000785ee9ce9c25ff72b88965aa45 (diff) | |
| download | mariadb-git-bc17b14d94ada8c0510c799c3e66e70e698579c1.tar.gz | |
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
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 eaa27c1009d..e18d1cfa189 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); |