diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-31 12:54:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-01-31 21:51:45 +0100 |
| commit | b050354ffb15e4e27498b169ec723da4d8aa8da6 (patch) | |
| tree | 36ae0529f9ba4cd827b8fee44f93336d7f9f36c2 /sql/item_cmpfunc.cc | |
| parent | f299da89babddc78a06efff918d815bc3b9562d8 (diff) | |
| download | mariadb-git-b050354ffb15e4e27498b169ec723da4d8aa8da6.tar.gz | |
compiler warnings
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 84ba2abf679..c619614bf78 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2462,7 +2462,7 @@ void Item_func_between::print(String *str, enum_query_type query_type) void -Item_func_case_abbreviation2::fix_length_and_dec(Item **args) +Item_func_case_abbreviation2::fix_length_and_dec2(Item **args) { uint32 char_length; agg_result_type(&cached_result_type, args, 2); @@ -2505,7 +2505,7 @@ Item_func_case_abbreviation2::fix_length_and_dec(Item **args) -uint Item_func_case_abbreviation2::decimal_precision(Item **args) const +uint Item_func_case_abbreviation2::decimal_precision2(Item **args) const { int arg0_int_part= args[0]->decimal_int_part(); int arg1_int_part= args[1]->decimal_int_part(); @@ -2692,7 +2692,7 @@ Item_func_if::fix_length_and_dec() maybe_null= true; return; } - Item_func_case_abbreviation2::fix_length_and_dec(args + 1); + Item_func_case_abbreviation2::fix_length_and_dec2(args + 1); } |