mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-25 09:45:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/hf/work/27921/my50-27921

Browse source 
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
This commit is contained in:
unknown 2007-05-11 13:07:53 +05:00
commit 812a6ee7af
8 changed files with 64 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/item_create.h
View file

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