bzr commit into mysql-trunk branch (alexander.nozdrin:3146) WL#5787

[Alexander Nozdrin]

#At file:///home/alik/MySQL/bzr/00.build/mysql-trunk/ based on revid:vinay.fisrekar@stripped

 3146 Alexander Nozdrin	2011-06-02
      A follow-up for WL#5787.
      Fix wording in error-message and source code comment.

    modified:
      sql/item_inetfunc.cc
=== modified file 'sql/item_inetfunc.cc'
--- a/sql/item_inetfunc.cc	2011-05-30 07:26:59 +0000
+++ b/sql/item_inetfunc.cc	2011-06-02 14:01:33 +0000
@@ -70,8 +70,8 @@ longlong Item_func_inet_aton::val_int()
   if (c != '.')                                 // IP number can't end on '.'
   {
     /*
-      Attempt to support short-form addresses (i.e. classful addresses).
-      The current code does not support full range of classful addresses.
+      Attempt to support short forms of IP-addresses. It's however pretty
+      basic one comparing to the BSD support.
       Examples:
         127     -> 0.0.0.127
         127.255 -> 127.0.0.255
@@ -310,7 +310,7 @@ static bool str_to_ipv4(const char *str,
   if (dot_count != 3)
   {
     DBUG_PRINT("error", ("str_to_ipv4(%.*s): invalid IPv4 address: "
-                         "classful address (too few groups).",
+                         "too few groups.",
                          str_length, str));
     return false;
   }


Attachment: [text/bzr-bundle] bzr/[e-mail]