diff options
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 0ccc7febd0a..7495987856a 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -372,8 +372,7 @@ String *Item_real_func::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals,default_charset()); + str->set(nr,decimals,default_charset()); return str; } @@ -385,7 +384,7 @@ String *Item_num_func::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; /* purecov: inspected */ - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr,default_charset()); else str->set((ulonglong) nr,default_charset()); @@ -395,8 +394,7 @@ String *Item_num_func::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals,default_charset()); + str->set(nr,decimals,default_charset()); } return str; } @@ -422,7 +420,7 @@ String *Item_int_func::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr,default_charset()); else str->set((ulonglong) nr,default_charset()); @@ -451,7 +449,7 @@ String *Item_num_op::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; /* purecov: inspected */ - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr,default_charset()); else str->set((ulonglong) nr,default_charset()); @@ -461,8 +459,7 @@ String *Item_num_op::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals,default_charset()); + str->set(nr,decimals,default_charset()); } return str; } @@ -1032,7 +1029,7 @@ String *Item_func_min_max::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr,default_charset()); else str->set((ulonglong) nr,default_charset()); @@ -1043,8 +1040,7 @@ String *Item_func_min_max::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals,default_charset()); + str->set(nr,decimals,default_charset()); return str; } case STRING_RESULT: @@ -1672,8 +1668,7 @@ String *Item_func_udf_float::val_str(String *str) double nr=val(); if (null_value) return 0; /* purecov: inspected */ - else - str->set(nr,decimals,default_charset()); + str->set(nr,decimals,default_charset()); return str; } @@ -1693,7 +1688,7 @@ String *Item_func_udf_int::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; - else if (!unsigned_flag) + if (!unsigned_flag) str->set(nr,default_charset()); else str->set((ulonglong) nr,default_charset()); |