diff options
| author | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
| commit | 0bb0d52221af99c46d17486382806caa6dd7338e (patch) | |
| tree | 92b2ddfceaf8df5be6d47774b25fd3006ac5bb35 /sql/item_inetfunc.cc | |
| parent | 7dbff2c513aeec3b3f3d0fa4952ae97deba22282 (diff) | |
| parent | d40c23570ff1a9ba5aa317b85a32a4b27780b8ab (diff) | |
| download | mariadb-git-0bb0d52221af99c46d17486382806caa6dd7338e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/cte_recursive.result
mysql-test/r/derived_cond_pushdown.result
mysql-test/t/cte_recursive.test
mysql-test/t/derived_cond_pushdown.test
sql/datadict.cc
sql/handler.cc
Diffstat (limited to 'sql/item_inetfunc.cc')
| -rw-r--r-- | sql/item_inetfunc.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_inetfunc.cc b/sql/item_inetfunc.cc index 9aaa64823f7..ff671536002 100644 --- a/sql/item_inetfunc.cc +++ b/sql/item_inetfunc.cc @@ -181,7 +181,8 @@ String *Item_func_inet_str_base::val_str_ascii(String *buffer) return NULL; } - String *arg_str= args[0]->val_str(buffer); + StringBuffer<STRING_BUFFER_USUAL_SIZE> tmp; + String *arg_str= args[0]->val_str(&tmp); if (!arg_str) // Out-of memory happened. The error has been reported. { // Or: the underlying field is NULL null_value= true; @@ -679,7 +680,7 @@ static void ipv6_to_str(const in6_addr *ipv6, char *str) @retval true The string has been converted sucessfully. */ -bool Item_func_inet6_aton::calc_value(String *arg, String *buffer) +bool Item_func_inet6_aton::calc_value(const String *arg, String *buffer) { // ipv4-string -> varbinary(4) // ipv6-string -> varbinary(16) @@ -719,7 +720,7 @@ bool Item_func_inet6_aton::calc_value(String *arg, String *buffer) @retval true The string has been converted sucessfully. */ -bool Item_func_inet6_ntoa::calc_value(String *arg, String *buffer) +bool Item_func_inet6_ntoa::calc_value(const String *arg, String *buffer) { if (arg->charset() != &my_charset_bin) return false; |