Merge branch '10.2' into 10.3

1 files changed, 9 insertions, 0 deletions

diff --git a/sql/item.h b/sql/item.h
index 694672deabc..d28371be8f5 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -5392,6 +5392,15 @@ public:
     item_equal= NULL;
     Item_direct_ref::cleanup();
   }
+  /*
+    TODO move these val_*_result function to Item_dierct_ref (maybe)
+  */
+  double val_result();
+  longlong val_int_result();
+  String *str_result(String* tmp);
+  my_decimal *val_decimal_result(my_decimal *val);
+  bool val_bool_result();
+
   Item *get_copy(THD *thd)
   { return get_item_copy<Item_direct_view_ref>(thd, this); }
 };