diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 18:19:47 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 18:19:47 +0500 |
| commit | d4b87344622536cf21ab6260abb2f9b2c8a0be61 (patch) | |
| tree | c4016f4c2c8a5b600a23c6bc957c75a94d88cd71 /sql/item_create.cc | |
| parent | 812a6ee7afdd79341c1b63ea328631bafe1e8839 (diff) | |
| download | mariadb-git-d4b87344622536cf21ab6260abb2f9b2c8a0be61.tar.gz | |
merging fixes
mysql-test/t/view.test:
merging fix
sql/item_create.cc:
merging fix
sql/my_decimal.cc:
merging fix
sql/my_decimal.h:
merging fix
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index c40c7a4de6c..29d2b8fe3b3 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -3947,6 +3947,7 @@ Create_func_master_pos_wait::create_native(THD *thd, LEX_STRING name, my_error(ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT, MYF(0), name.str); break; } + } return func; } @@ -4972,7 +4973,7 @@ find_qualified_function_builder(THD *thd) Item * -create_func_cast(Item *a, Cast_target cast_type, +create_func_cast(THD *thd, Item *a, Cast_target cast_type, const char *c_len, const char *c_dec, CHARSET_INFO *cs) { |