Merge 10.4 into 10.5

1 files changed, 4 insertions, 5 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 51ade5a9068..6226b741e91 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1456,14 +1456,13 @@ public:
   }
   void fix_length_and_dec_decimal()
   {
-    Item_num_op::fix_length_and_dec_decimal();
-    unsigned_flag= args[0]->unsigned_flag;
+    result_precision();
+    fix_decimals();
   }
   void fix_length_and_dec_int()
   {
-    max_length= MY_MAX(args[0]->max_length, args[1]->max_length);
-    decimals= 0;
-    unsigned_flag= args[0]->unsigned_flag;
+    result_precision();
+    DBUG_ASSERT(decimals == 0);
     set_handler(type_handler_long_or_longlong());
   }
   bool check_partition_func_processor(void *int_arg) {return FALSE;}