diff options
author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-01 22:29:47 +0300 |
---|---|---|
committer | Galina Shalygina <galashalygina@gmail.com> | 2016-08-23 00:39:12 +0300 |
commit | eb2c1474752a5f743db638d5b06612c9e3f07f74 (patch) | |
tree | 2cbdafbe8617bf72f8addf3cfcdd53b10c7cbe8e /sql/item_inetfunc.h | |
parent | 8b94aec11af19fc711ed48f13410986814bc51a0 (diff) | |
download | mariadb-git-eb2c1474752a5f743db638d5b06612c9e3f07f74.tar.gz |
The consolidated patch for mdev-9197.
Diffstat (limited to 'sql/item_inetfunc.h')
-rw-r--r-- | sql/item_inetfunc.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sql/item_inetfunc.h b/sql/item_inetfunc.h index 82a4405df1e..9dcb3ab0db7 100644 --- a/sql/item_inetfunc.h +++ b/sql/item_inetfunc.h @@ -37,6 +37,8 @@ public: maybe_null= 1; unsigned_flag= 1; } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_func_inet_aton>(thd, mem_root, this); } }; @@ -57,6 +59,8 @@ public: fix_length_and_charset(3 * 8 + 7, default_charset()); maybe_null= 1; } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_func_inet_ntoa>(thd, mem_root, this); } }; @@ -123,6 +127,8 @@ public: fix_length_and_charset(16, &my_charset_bin); maybe_null= 1; } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_func_inet6_aton>(thd, mem_root, this); } protected: virtual bool calc_value(String *arg, String *buffer); @@ -155,6 +161,8 @@ public: maybe_null= 1; } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_func_inet6_ntoa>(thd, mem_root, this); } protected: virtual bool calc_value(String *arg, String *buffer); @@ -175,6 +183,8 @@ public: public: virtual const char *func_name() const { return "is_ipv4"; } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_func_is_ipv4>(thd, mem_root, this); } protected: virtual bool calc_value(const String *arg); @@ -195,6 +205,8 @@ public: public: virtual const char *func_name() const { return "is_ipv6"; } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_func_is_ipv6>(thd, mem_root, this); } protected: virtual bool calc_value(const String *arg); @@ -215,6 +227,8 @@ public: public: virtual const char *func_name() const { return "is_ipv4_compat"; } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_func_is_ipv4_compat>(thd, mem_root, this); } protected: virtual bool calc_value(const String *arg); @@ -235,6 +249,8 @@ public: public: virtual const char *func_name() const { return "is_ipv4_mapped"; } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_func_is_ipv4_mapped>(thd, mem_root, this); } protected: virtual bool calc_value(const String *arg); |