From: Alexander Nozdrin
Date: June 2 2011 2:01pm
Subject: bzr push into mysql-trunk branch (alexander.nozdrin:3145 to 3146) WL#5787
List-Archive: http://lists.mysql.com/commits/138597
Message-Id: <201106021401.p52E1giu000388@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 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
 3145 Vinay Fisrekar	2011-06-02 [merge]
      merge from mysql-5.5 -> mysql-trunk
       Correcting "innodb_prefix_index_liftedlimit" failure for embedded mode run. Separate out sub-test.

    added:
      mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result
      mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test
    modified:
      mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
      mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
=== 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;
   }

No bundle (reason: useless for push emails).