Merge 10.4 into 10.5

1 files changed, 3 insertions, 0 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index f39caa46ffd..5b4acdce1c6 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1838,6 +1838,7 @@ public:
   Item_func_int_val(THD *thd, Item *a): Item_func_hybrid_field_type(thd, a) {}
   bool check_partition_func_processor(void *int_arg) { return FALSE; }
   bool check_vcol_func_processor(void *arg) { return FALSE; }
+  virtual decimal_round_mode round_mode() const= 0;
   void fix_length_and_dec_double();
   void fix_length_and_dec_int_or_decimal();
   void fix_length_and_dec_time()
@@ -1866,6 +1867,7 @@ class Item_func_ceiling :public Item_func_int_val
 public:
   Item_func_ceiling(THD *thd, Item *a): Item_func_int_val(thd, a) {}
   const char *func_name() const { return "ceiling"; }
+  decimal_round_mode round_mode() const { return CEILING; }
   longlong int_op();
   double real_op();
   my_decimal *decimal_op(my_decimal *);
@@ -1881,6 +1883,7 @@ class Item_func_floor :public Item_func_int_val
 public:
   Item_func_floor(THD *thd, Item *a): Item_func_int_val(thd, a) {}
   const char *func_name() const { return "floor"; }
+  decimal_round_mode round_mode() const { return FLOOR; }
   longlong int_op();
   double real_op();
   my_decimal *decimal_op(my_decimal *);