diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-11 13:07:53 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-11 13:07:53 +0500 |
| commit | 812a6ee7afdd79341c1b63ea328631bafe1e8839 (patch) | |
| tree | cfe1053ca43f5280090655ddfc9adf20870cb60c /sql/item_create.h | |
| parent | 59ae1777e5e5e123baf57e497791a2c2596096da (diff) | |
| parent | a6da564a1d15925780f45d4bef439d4ae548f70d (diff) | |
| download | mariadb-git-812a6ee7afdd79341c1b63ea328631bafe1e8839.tar.gz | |
Merge mysql.com:/home/hf/work/27921/my50-27921
into mysql.com:/home/hf/work/27921/my51-27921
mysql-test/r/cast.result:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/field.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_create.h:
merging
sql/my_decimal.h:
merging
sql/sql_yacc.yy:
merging
Diffstat (limited to 'sql/item_create.h')
| -rw-r--r-- | sql/item_create.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_create.h b/sql/item_create.h index 0a668b3e67f..7ace4032515 100644 --- a/sql/item_create.h +++ b/sql/item_create.h @@ -159,9 +159,9 @@ protected: @param dec TODO @param cs The character set */ -Item* -create_func_cast(THD *thd, Item *a, Cast_target cast_type, int len, int dec, +Item * +create_func_cast(THD *thd, Item *a, Cast_target cast_type, + const char *len, const char *dec, CHARSET_INFO *cs); - #endif |