List:Commits« Previous MessageNext Message »
From:paul.dubois Date:May 17 2011 7:26pm
Subject:svn commit - mysqldoc@oter02: r26255 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: pd221994
Date: 2011-05-17 21:26:07 +0200 (Tue, 17 May 2011)
New Revision: 26255

Log:
 r48071@dhcp-adc-twvpn-1-vpnpool-10-154-25-110:  paul | 2011-05-17 13:48:11 -0500
 INET_NTOA/INET_ATON: Mention that these are for IPv4 (we'll soon have IPv6
 function docs); don't suggest using these for short-form addresses; use
 private-network addresses in examples


Modified:
   svk:merge
   trunk/refman-5.0/functions-core.xml
   trunk/refman-5.1/functions-core.xml
   trunk/refman-5.5/functions-core.xml
   trunk/refman-5.6/functions-core.xml
   trunk/refman-6.0/functions-core.xml

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes


Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml	2011-05-17 19:25:58 UTC (rev 26254)
+++ trunk/refman-5.0/functions-core.xml	2011-05-17 19:26:07 UTC (rev 26255)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 20; 3291 bytes

@@ -16769,9 +16769,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given the dotted-quad representation of a network address as a
-          string, returns an integer that represents the numeric value
-          of the address. Addresses may be 4- or 8-byte addresses.
+          Given the dotted-quad representation of an IPv4 network
+          address as a string, returns an integer that represents the
+          numeric value of the address in network byte order (big
+          endian). Addresses may be 4- or 8-byte addresses.
         </para>
 
         <remark role="help-description-end"/>

@@ -16779,31 +16780,29 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('209.207.224.40');</userinput>
-        -&gt; 3520061480
+mysql&gt; <userinput>SELECT INET_ATON('10.0.5.9');</userinput>
+        -&gt; 167773449
 </programlisting>
 
         <para>
-          The generated number is always in network byte order. For the
-          example just shown, the number is calculated as
+          For this example, the number is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> also understands
-          short-form IP addresses:
+          <literal role="func">INET_ATON()</literal> may or may not
+          return a non-<literal>NULL</literal> result for short-form IP
+          addresses (such as <literal>'127.1'</literal> as a
+          representation of <literal>'127.0.0.1'</literal>). Because of
+          this, <literal role="func">INET_ATON()</literal>a should not
+          be used for such addresses.
         </para>
 
-<programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('127.0.0.1'), INET_ATON('127.1');</userinput>
-        -&gt; 2130706433, 2130706433
-</programlisting>
-
         <note>
           <para>
-            When storing values generated by
+            To store values generated by
             <literal role="func">INET_ATON()</literal>, it is
             recommended that you use an <literal>INT UNSIGNED</literal>
             column. If you use a (signed)

@@ -16833,9 +16832,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric network address in network byte order (4 or 8
-          byte), returns the dotted-quad representation of the address
-          as a binary string.
+          Given a numeric IPv4 network address in network byte order (4
+          or 8 byte), returns the dotted-quad representation of the
+          address as a binary string.
         </para>
 
         <remark role="help-description-end"/>

@@ -16843,8 +16842,8 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_NTOA(3520061480);</userinput>
-        -&gt; '209.207.224.40'
+mysql&gt; <userinput>SELECT INET_NTOA(167773449);</userinput>
+        -&gt; '10.0.5.9'
 </programlisting>
       </listitem>
 


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2011-05-17 19:25:58 UTC (rev 26254)
+++ trunk/refman-5.1/functions-core.xml	2011-05-17 19:26:07 UTC (rev 26255)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 20; 3291 bytes

@@ -18182,9 +18182,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given the dotted-quad representation of a network address as a
-          string, returns an integer that represents the numeric value
-          of the address. Addresses may be 4- or 8-byte addresses.
+          Given the dotted-quad representation of an IPv4 network
+          address as a string, returns an integer that represents the
+          numeric value of the address in network byte order (big
+          endian). Addresses may be 4- or 8-byte addresses.
         </para>
 
         <remark role="help-description-end"/>

@@ -18192,31 +18193,29 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('209.207.224.40');</userinput>
-        -&gt; 3520061480
+mysql&gt; <userinput>SELECT INET_ATON('10.0.5.9');</userinput>
+        -&gt; 167773449
 </programlisting>
 
         <para>
-          The generated number is always in network byte order. For the
-          example just shown, the number is calculated as
+          For this example, the number is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> also understands
-          short-form IP addresses:
+          <literal role="func">INET_ATON()</literal> may or may not
+          return a non-<literal>NULL</literal> result for short-form IP
+          addresses (such as <literal>'127.1'</literal> as a
+          representation of <literal>'127.0.0.1'</literal>). Because of
+          this, <literal role="func">INET_ATON()</literal>a should not
+          be used for such addresses.
         </para>
 
-<programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('127.0.0.1'), INET_ATON('127.1');</userinput>
-        -&gt; 2130706433, 2130706433
-</programlisting>
-
         <note>
           <para>
-            When storing values generated by
+            To store values generated by
             <literal role="func">INET_ATON()</literal>, it is
             recommended that you use an <literal>INT UNSIGNED</literal>
             column. If you use a (signed)

@@ -18246,9 +18245,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric network address in network byte order (4 or 8
-          byte), returns the dotted-quad representation of the address
-          as a binary string.
+          Given a numeric IPv4 network address in network byte order (4
+          or 8 byte), returns the dotted-quad representation of the
+          address as a binary string.
         </para>
 
         <remark role="help-description-end"/>

@@ -18256,8 +18255,8 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_NTOA(3520061480);</userinput>
-        -&gt; '209.207.224.40'
+mysql&gt; <userinput>SELECT INET_NTOA(167773449);</userinput>
+        -&gt; '10.0.5.9'
 </programlisting>
       </listitem>
 


Modified: trunk/refman-5.5/functions-core.xml
===================================================================
--- trunk/refman-5.5/functions-core.xml	2011-05-17 19:25:58 UTC (rev 26254)
+++ trunk/refman-5.5/functions-core.xml	2011-05-17 19:26:07 UTC (rev 26255)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 20; 3246 bytes

@@ -18491,9 +18491,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given the dotted-quad representation of a network address as a
-          string, returns an integer that represents the numeric value
-          of the address. Addresses may be 4- or 8-byte addresses.
+          Given the dotted-quad representation of an IPv4 network
+          address as a string, returns an integer that represents the
+          numeric value of the address in network byte order (big
+          endian). Addresses may be 4- or 8-byte addresses.
         </para>
 
         <remark role="help-description-end"/>

@@ -18501,31 +18502,29 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('209.207.224.40');</userinput>
-        -&gt; 3520061480
+mysql&gt; <userinput>SELECT INET_ATON('10.0.5.9');</userinput>
+        -&gt; 167773449
 </programlisting>
 
         <para>
-          The generated number is always in network byte order. For the
-          example just shown, the number is calculated as
+          For this example, the number is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> also understands
-          short-form IP addresses:
+          <literal role="func">INET_ATON()</literal> may or may not
+          return a non-<literal>NULL</literal> result for short-form IP
+          addresses (such as <literal>'127.1'</literal> as a
+          representation of <literal>'127.0.0.1'</literal>). Because of
+          this, <literal role="func">INET_ATON()</literal>a should not
+          be used for such addresses.
         </para>
 
-<programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('127.0.0.1'), INET_ATON('127.1');</userinput>
-        -&gt; 2130706433, 2130706433
-</programlisting>
-
         <note>
           <para>
-            When storing values generated by
+            To store values generated by
             <literal role="func">INET_ATON()</literal>, it is
             recommended that you use an <literal>INT UNSIGNED</literal>
             column. If you use a (signed)

@@ -18555,9 +18554,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric network address in network byte order (4 or 8
-          byte), returns the dotted-quad representation of the address
-          as a string.
+          Given a numeric IPv4 network address in network byte order (4
+          or 8 byte), returns the dotted-quad representation of the
+          address as a string.
         </para>
 
         <para>

@@ -18571,8 +18570,8 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_NTOA(3520061480);</userinput>
-        -&gt; '209.207.224.40'
+mysql&gt; <userinput>SELECT INET_NTOA(167773449);</userinput>
+        -&gt; '10.0.5.9'
 </programlisting>
       </listitem>
 


Modified: trunk/refman-5.6/functions-core.xml
===================================================================
--- trunk/refman-5.6/functions-core.xml	2011-05-17 19:25:58 UTC (rev 26254)
+++ trunk/refman-5.6/functions-core.xml	2011-05-17 19:26:07 UTC (rev 26255)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 20; 3277 bytes

@@ -18851,9 +18851,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given the dotted-quad representation of a network address as a
-          string, returns an integer that represents the numeric value
-          of the address. Addresses may be 4- or 8-byte addresses.
+          Given the dotted-quad representation of an IPv4 network
+          address as a string, returns an integer that represents the
+          numeric value of the address in network byte order (big
+          endian). Addresses may be 4- or 8-byte addresses.
         </para>
 
         <remark role="help-description-end"/>

@@ -18861,31 +18862,29 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('209.207.224.40');</userinput>
-        -&gt; 3520061480
+mysql&gt; <userinput>SELECT INET_ATON('10.0.5.9');</userinput>
+        -&gt; 167773449
 </programlisting>
 
         <para>
-          The generated number is always in network byte order. For the
-          example just shown, the number is calculated as
+          For this example, the number is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> also understands
-          short-form IP addresses:
+          <literal role="func">INET_ATON()</literal> may or may not
+          return a non-<literal>NULL</literal> result for short-form IP
+          addresses (such as <literal>'127.1'</literal> as a
+          representation of <literal>'127.0.0.1'</literal>). Because of
+          this, <literal role="func">INET_ATON()</literal>a should not
+          be used for such addresses.
         </para>
 
-<programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('127.0.0.1'), INET_ATON('127.1');</userinput>
-        -&gt; 2130706433, 2130706433
-</programlisting>
-
         <note>
           <para>
-            When storing values generated by
+            To store values generated by
             <literal role="func">INET_ATON()</literal>, it is
             recommended that you use an <literal>INT UNSIGNED</literal>
             column. If you use a (signed)

@@ -18915,9 +18914,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric network address in network byte order (4 or 8
-          byte), returns the dotted-quad representation of the address
-          as a string.
+          Given a numeric IPv4 network address in network byte order (4
+          or 8 byte), returns the dotted-quad representation of the
+          address as a string.
         </para>
 
         <remark role="help-description-end"/>

@@ -18925,8 +18924,8 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_NTOA(3520061480);</userinput>
-        -&gt; '209.207.224.40'
+mysql&gt; <userinput>SELECT INET_NTOA(167773449);</userinput>
+        -&gt; '10.0.5.9'
 </programlisting>
       </listitem>
 


Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml	2011-05-17 19:25:58 UTC (rev 26254)
+++ trunk/refman-6.0/functions-core.xml	2011-05-17 19:26:07 UTC (rev 26255)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 20; 3246 bytes

@@ -18782,9 +18782,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given the dotted-quad representation of a network address as a
-          string, returns an integer that represents the numeric value
-          of the address. Addresses may be 4- or 8-byte addresses.
+          Given the dotted-quad representation of an IPv4 network
+          address as a string, returns an integer that represents the
+          numeric value of the address in network byte order (big
+          endian). Addresses may be 4- or 8-byte addresses.
         </para>
 
         <remark role="help-description-end"/>

@@ -18792,31 +18793,29 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('209.207.224.40');</userinput>
-        -&gt; 3520061480
+mysql&gt; <userinput>SELECT INET_ATON('10.0.5.9');</userinput>
+        -&gt; 167773449
 </programlisting>
 
         <para>
-          The generated number is always in network byte order. For the
-          example just shown, the number is calculated as
+          For this example, the number is calculated as
           209&times;256<superscript>3</superscript> +
           207&times;256<superscript>2</superscript> + 224&times;256 +
           40.
         </para>
 
         <para>
-          <literal role="func">INET_ATON()</literal> also understands
-          short-form IP addresses:
+          <literal role="func">INET_ATON()</literal> may or may not
+          return a non-<literal>NULL</literal> result for short-form IP
+          addresses (such as <literal>'127.1'</literal> as a
+          representation of <literal>'127.0.0.1'</literal>). Because of
+          this, <literal role="func">INET_ATON()</literal>a should not
+          be used for such addresses.
         </para>
 
-<programlisting>
-mysql&gt; <userinput>SELECT INET_ATON('127.0.0.1'), INET_ATON('127.1');</userinput>
-        -&gt; 2130706433, 2130706433
-</programlisting>
-
         <note>
           <para>
-            When storing values generated by
+            To store values generated by
             <literal role="func">INET_ATON()</literal>, it is
             recommended that you use an <literal>INT UNSIGNED</literal>
             column. If you use a (signed)

@@ -18846,9 +18845,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Given a numeric network address in network byte order (4 or 8
-          byte), returns the dotted-quad representation of the address
-          as a string.
+          Given a numeric IPv4 network address in network byte order (4
+          or 8 byte), returns the dotted-quad representation of the
+          address as a string.
         </para>
 
         <para>

@@ -18862,8 +18861,8 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>SELECT INET_NTOA(3520061480);</userinput>
-        -&gt; '209.207.224.40'
+mysql&gt; <userinput>SELECT INET_NTOA(167773449);</userinput>
+        -&gt; '10.0.5.9'
 </programlisting>
       </listitem>
 


Thread
svn commit - mysqldoc@oter02: r26255 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois18 May