diff options
| author | unknown <monty@mysql.com> | 2005-11-02 14:43:25 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-02 14:43:25 +0200 |
| commit | a73b682af9d39bda9a1972d268a3703da4131a12 (patch) | |
| tree | aaa67a99674d8a7acaf23771c5994ceda6c00fa4 /sql/item_func.cc | |
| parent | 256d286174c25f25ec4d7af44b0397493a0be9e7 (diff) | |
| download | mariadb-git-a73b682af9d39bda9a1972d268a3703da4131a12.tar.gz | |
Fixed wrong merge
Optimize new pushed code
sql/item_func.cc:
Fixed wrong merge
sql/sql_update.cc:
Optimize new pushed code
(There is no reason to add extra test for not common error case if code can handle it anyway)
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 44cee556dbd..9c1d1f63635 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1378,7 +1378,6 @@ my_decimal *Item_func_abs::decimal_op(my_decimal *decimal_value) void Item_func_abs::fix_length_and_dec() { Item_func_num1::fix_length_and_dec(); - maybe_null= 1; } |