diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-02 11:05:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-02 11:05:29 +0200 |
| commit | ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6 (patch) | |
| tree | 5c5c70ee11cdf4414a9cc9a5eacdae881933c70a /sql/item_inetfunc.cc | |
| parent | 5ec40fbb2704a0bf1369836d88a5def4721809c8 (diff) | |
| parent | 09ec8e2e2246f9fb67fd41631c5669d9ae26b2e5 (diff) | |
| download | mariadb-git-ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/item_inetfunc.cc')
| -rw-r--r-- | sql/item_inetfunc.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_inetfunc.cc b/sql/item_inetfunc.cc index 3643daf903f..bb00ccf2771 100644 --- a/sql/item_inetfunc.cc +++ b/sql/item_inetfunc.cc @@ -206,7 +206,7 @@ String *Item_func_inet_str_base::val_str_ascii(String *buffer) @return Completion status. @retval false Given string does not represent an IPv4-address. - @retval true The string has been converted sucessfully. + @retval true The string has been converted successfully. @note The problem with inet_pton() is that it treats leading zeros in IPv4-part differently on different platforms. @@ -331,7 +331,7 @@ static bool str_to_ipv4(const char *str, size_t str_length, in_addr *ipv4_addres @return Completion status. @retval false Given string does not represent an IPv6-address. - @retval true The string has been converted sucessfully. + @retval true The string has been converted successfully. @note The problem with inet_pton() is that it treats leading zeros in IPv4-part differently on different platforms. @@ -677,7 +677,7 @@ static void ipv6_to_str(const in6_addr *ipv6, char *str) @return Completion status. @retval false Given string does not represent an IP-address. - @retval true The string has been converted sucessfully. + @retval true The string has been converted successfully. */ bool Item_func_inet6_aton::calc_value(const String *arg, String *buffer) @@ -717,7 +717,7 @@ bool Item_func_inet6_aton::calc_value(const String *arg, String *buffer) @return Completion status. @retval false The argument does not correspond to IP-address. - @retval true The string has been converted sucessfully. + @retval true The string has been converted successfully. */ bool Item_func_inet6_ntoa::calc_value(const String *arg, String *buffer) |