Merge remote-tracking branch 'origin/10.1' into 10.2

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/item_inetfunc.h b/sql/item_inetfunc.h
index 741b9f7d997..f19749df0af 100644
--- a/sql/item_inetfunc.h
+++ b/sql/item_inetfunc.h
@@ -103,7 +103,7 @@ public:
   virtual String *val_str_ascii(String *buffer);
 
 protected:
-  virtual bool calc_value(String *arg, String *buffer) = 0;
+  virtual bool calc_value(const String *arg, String *buffer) = 0;
 };
 
 
@@ -132,7 +132,7 @@ public:
   { return get_item_copy<Item_func_inet6_aton>(thd, mem_root, this); }
 
 protected:
-  virtual bool calc_value(String *arg, String *buffer);
+  virtual bool calc_value(const String *arg, String *buffer);
 };
 
 
@@ -166,7 +166,7 @@ public:
   { return get_item_copy<Item_func_inet6_ntoa>(thd, mem_root, this); }
 
 protected:
-  virtual bool calc_value(String *arg, String *buffer);
+  virtual bool calc_value(const String *arg, String *buffer);
 };