diff options
author | unknown <gkodinov/kgeorge@macbook.gmz> | 2007-02-09 11:05:23 +0200 |
---|---|---|
committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2007-02-09 11:05:23 +0200 |
commit | 8f31da3cfd3b74b7f4691257599acfe3dc4d4ec0 (patch) | |
tree | 550343aa994a7881fe80e9e98102f1039797807a /sql | |
parent | bdc14162f5494e80f2183f8145ec6e97c9e37dff (diff) | |
download | mariadb-git-8f31da3cfd3b74b7f4691257599acfe3dc4d4ec0.tar.gz |
Addendum to fix of bug #22344 : removed dead code.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sql/item.cc b/sql/item.cc index 6d0297f909e..95001809e9a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5277,18 +5277,7 @@ my_decimal *Item_ref::val_decimal(my_decimal *decimal_value) int Item_ref::save_in_field(Field *to, bool no_conversions) { int res; - if (result_field) - { - if (result_field->is_null()) - { - null_value= 1; - return set_field_to_null_with_conversions(to, no_conversions); - } - to->set_notnull(); - res= field_conv(to, result_field); - null_value= 0; - return res; - } + DBUG_ASSERT(!result_field); res= (*ref)->save_in_field(to, no_conversions); null_value= (*ref)->null_value; return res; |