From: Alexander Nozdrin
Date: June 2 2011 2:01pm
Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3146) WL#5787
List-Archive: http://lists.mysql.com/commits/138596
Message-Id: <201106021401.p52E1dtB032735@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0391332631360575588=="

--===============0391332631360575588==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;
   }


--===============0391332631360575588==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alexander.nozdrin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   dyutjimqdjriavvc
# target_branch: file:///home/alik/MySQL/bzr/00.build/mysql-trunk/
# testament_sha1: 00d84b82f84ae4df673a1d202532301c70f7b46c
# timestamp: 2011-06-02 18:01:37 +0400
# base_revision_id: vinay.fisrekar@stripped\
#   yib1tmrbpvzs7v0s
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcNGWnEAAXn/gBAQAgBY5//3
dyVIgL////BQA9u3doyzE3t3PY8JKJqNpqZT9U9Tap7FNpkp7SmxAI00DbVDBJKZT0Gmgp4U1G2q
bKek/UEyeUNAAAkkDUJtFPRlTwkZqDQPUA0aBoekIJlT9JMTI0eoGgAAAA0AAlKg0ekaaMmQxNBo
aGj1AAGgImvhqrDu5Gw0bnoo699uCCBOD7qxngIgqZX7WGY+/EfKKccqEBMJDYu/hS8AYAjmY+81
eP566zON0RkQNWhrcNc//9eyFuptervJGCx+09+iNQ8yEZfigXjfoxLed2uFFqo5aHTZeuCRCKkB
jc7ZB6XFnUdnPQFBwu1Ba4lhAQ8JaE1nYWDWLxD+knbO+HNYK1l04uC3FeNoJv0d1OZOMHyCpFzU
3qcZs0Sc37E7XVSp68ietRkXps274oWWaDPddF+FpjcpNr0gVKbHCMc+k2D9DjQoKV88J1HoV1OL
VIlUsuuyeky61BLEjAylezjXrOeW0mbzW19vRD/cx8aEDOk8+29cHOUHQSpXx6stCkFk6iGNuA+N
545lE4zLKDpST11l5t7FKVkjIHLqYnUhns6t0oECWB0UD4laLjHGJKyycpqnHA+297TeBOkU0GkO
FHai2fE7MOyt8YHHu9tOKZLsPrqtBif95Oc4/rMrWwz00JoYeLhgbFHl8/fvqSO7Rs3lBmCFhaMb
z8NPVLV6oNPFUi41qAvfQremOZWG3luZIbncDeYqnmcURpcMWKbQdI1PFd1ZKXe/lGuXpZkjdFIa
9roW+XRwwV5dKhQTYuT9nG2p86B2hjzFVqgjTqLu5XT18kJ1nHAox2UUwJcc/A7ZpThGJFurbY2p
fmp49bb/u0iGelm1MXyaxBVm6MLm65iZkU30YFliCCz3YmCr26WtL4FMSnt3OuUumQMWSDaU4wiK
eXsvLAfyhvdL0BQzbel2qkMbPBNTqMVAqK+xmA615wtWFs/7tyniDILbTXsoOGP6rJufRHBIBggS
8y+CymCyoFekEkyQw54INXDyeeHAckQV6f06rqCTreYytzj5nirUj3LYmAbhMrVQTAyB5MKt+oHK
mIoMmUqKyzTSzB4iVgR91lCjc0iIe+QezkpKr37qeHWBnlTHazKKu6qp1KlIx6lbAVo+l2+EGSIK
CSeisi6mi88/chCDQA32iAPPjEV1ywutQNEiUSH9IjZRWQE2DTMt7Swv9QO3FRiz4a0+T1IIhAaO
Jd8ulzPbwL2qVhUb61N9qdsbCfQXmqDCwLQsMKnLvfbdsI5Zg6mpXGYt3mvcK1SxTBkL0KbMqMsH
oIMsLhya5aYCfSgUKbT+LuSKcKEhhoy04g==


--===============0391332631360575588==--