summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-10-29 15:16:53 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-10-29 15:16:53 +0100
commit2e5450af052040848042c6eae4f03efa23c5f8fc (patch)
tree0f2d695372c7aae8fc5ea63cf78f57475c297de2 /sql/item_func.cc
parent17cf27f5b61aace463c3ae52df54c2363d2d4ca8 (diff)
parentd6302c9a47615019a3bca5304d3f61c587d826b8 (diff)
downloadmariadb-git-2e5450af052040848042c6eae4f03efa23c5f8fc.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 9d3ff804406..4d03e209eab 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1700,8 +1700,6 @@ my_decimal *Item_func_div::decimal_op(my_decimal *decimal_value)
null_value= 1;
return 0;
}
- my_decimal_round(E_DEC_FATAL_ERROR, decimal_value,
- decimals, FALSE, decimal_value);
return decimal_value;
}