List:Commits« Previous MessageNext Message »
From:paul Date:January 22 2006 8:08pm
Subject:svn commit - mysqldoc@docsrva: r991 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-22 21:08:44 +0100 (Sun, 22 Jan 2006)
New Revision: 991

Log:
 r6563@frost:  paul | 2006-01-22 14:07:08 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/functions.xml
   trunk/refman-4.1/innodb.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.0/innodb.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/installing.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6562
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6563
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396

Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-4.1/data-types.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -879,9 +879,9 @@
         The <literal>SUM()</literal> and <literal>AVG()</literal>
         aggregate functions do not work with temporal values. (They
         convert the values to numbers, which loses the part after the
-        first non-numeric character.) To work around this, you can
-        convert to numeric units, perform the aggregate operation, and
-        convert back to a temporal value. Examples:
+        first non-numeric character.) To work around this problem, you
+        can convert to numeric units, perform the aggregate operation,
+        and convert back to a temporal value. Examples:
       </para>
 
 <programlisting>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-4.1/database-administration.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -3614,8 +3614,8 @@
 
             <para>
               The maximum allowed result length for the
-              <literal>GROUP_CONCAT()</literal> function. This variable
-              was added in MySQL 4.1.0.
+              <literal>GROUP_CONCAT()</literal> function. The default is
+              1024. This variable was added in MySQL 4.1.0.
             </para>
           </listitem>
 

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-4.1/functions.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -12960,28 +12960,29 @@
           <para>
             The ID that was generated is maintained in the server on a
             <emphasis>per-connection basis</emphasis>. This means that
-            the value which the function returns to a given client is
-            the first <literal>AUTO_INCREMENT</literal> value generated
-            for most recent statement affecting an
-            <literal>AUTO_INCREMENT</literal> column by that client.
-            This value cannot be affected by other clients, even if they
-            generate <literal>AUTO_INCREMENT</literal> values of their
-            own. This behavior ensures that you can retrieve your own ID
+            the value returned by the function to a given client is the
+            first <literal>AUTO_INCREMENT</literal> value generated for
+            most recent statement affecting an
+            <literal>AUTO_INCREMENT</literal> column <emphasis>by that
+            client</emphasis>. This value cannot be affected by other
+            clients, even if they generate
+            <literal>AUTO_INCREMENT</literal> values of their own. This
+            behavior ensures that each client can retrieve its own ID
             without concern for the activity of other clients, and
             without the need for locks or transactions.
           </para>
 
           <para>
             The value of <literal>LAST_INSERT_ID()</literal> is not
-            changed if you update the <literal>AUTO_INCREMENT</literal>
-            column of a row with a non-<quote>magic</quote> value (that
+            changed if you set the <literal>AUTO_INCREMENT</literal>
+            column of a row to a non-<quote>magic</quote> value (that
             is, a value that is not <literal>NULL</literal> and not
             <literal>0</literal>).
           </para>
 
           <para>
             <emphasis role="bold">Important</emphasis>: If you insert
-            mutliple rows using a single <literal>INSERT</literal>
+            multiple rows using a single <literal>INSERT</literal>
             statement, <literal>LAST_INSERT_ID()</literal> returns the
             value generated for the <emphasis>first</emphasis> inserted
             row <emphasis>only</emphasis>. The reason for this is to
@@ -13003,7 +13004,7 @@
     -&gt; <userinput>);</userinput>
 Query OK, 0 rows affected (0.09 sec)
 
-mysql&gt; <literal>INSERT INTO t VALUES (NULL, 'Bob');</literal>
+mysql&gt; <userinput>INSERT INTO t VALUES (NULL, 'Bob');</userinput>
 Query OK, 1 row affected (0.01 sec)
 
 mysql&gt; <userinput>SELECT * FROM t;</userinput>
@@ -13049,7 +13050,7 @@
 
           <para>
             Although the second <literal>INSERT</literal> statement
-            inserted 3 new rows into <literal>t</literal>, the ID
+            inserted three new rows into <literal>t</literal>, the ID
             generated for the first of these rows was
             <literal>2</literal>, and it is this value that is returned
             by <literal>LAST_INSERT_ID()</literal> for the following
@@ -13080,7 +13081,7 @@
             simulate sequences:
           </para>
 
-          <itemizedlist>
+          <orderedlist>
 
             <listitem>
               <para>
@@ -13116,7 +13117,7 @@
               </para>
             </listitem>
 
-          </itemizedlist>
+          </orderedlist>
 
           <para>
             You can generate sequences without calling
@@ -13389,7 +13390,7 @@
 
           <para>
             Tries to obtain a lock with a name given by the string
-            <replaceable>str</replaceable>, with a timeout of
+            <replaceable>str</replaceable>, using a timeout of
             <replaceable>timeout</replaceable> seconds. Returns
             <literal>1</literal> if the lock was obtained successfully,
             <literal>0</literal> if the attempt timed out (for example,
@@ -13491,9 +13492,9 @@
           <para>
             The generated number is always in network byte order. For
             the example just shown, the number is calculated as
-            <literal>209&times;256<superscript>3</superscript> +
+            209&times;256<superscript>3</superscript> +
             207&times;256<superscript>2</superscript> + 224&times;256 +
-            40</literal>.
+            40.
           </para>
 
           <para>
@@ -13512,9 +13513,7 @@
             recommended that you use an <literal>INT UNSIGNED</literal>
             column. If you use a (signed) <literal>INT</literal> column,
             values corresponding to IP addresses for which the first
-            octet is greater than 127 will be truncated to 2147483647
-            (that is, the value returned by
-            <literal>INET_ATON('127.255.255.255')</literal>). See
+            octet is greater than 127 cannot be stored correctly. See
             <xref linkend="numeric-types"/>.
           </para>
 
@@ -13581,8 +13580,8 @@
             is free to use (that is, not locked). Returns
             <literal>1</literal> if the lock is free (no one is using
             the lock), <literal>0</literal> if the lock is in use, and
-            <literal>NULL</literal> on errors (such as incorrect
-            arguments).
+            <literal>NULL</literal> if an error occurs (such as an
+            incorrect argument).
           </para>
 
           <remark role="help-description-end"/>
@@ -13644,11 +13643,11 @@
             This function is useful for control of master/slave
             synchronization. It blocks until the slave has read and
             applied all updates up to the specified position in the
-            master log. The return value is the number of log events it
-            had to wait for to get to the specified position. The
-            function returns <literal>NULL</literal> if the slave SQL
-            thread is not started, the slave's master information is not
-            initialized, the arguments are incorrect, or an error
+            master log. The return value is the number of log events the
+            slave had to wait for to advance to the specified position.
+            The function returns <literal>NULL</literal> if the slave
+            SQL thread is not started, the slave's master information is
+            not initialized, the arguments are incorrect, or an error
             occurs. It returns <literal>-1</literal> if the timeout has
             been exceeded. If the slave SQL thread stops while
             <literal>MASTER_POS_WAIT()</literal> is waiting, the
@@ -13901,9 +13900,9 @@
         The <literal>SUM()</literal> and <literal>AVG()</literal>
         aggregate functions do not work with temporal values. (They
         convert the values to numbers, which loses the part after the
-        first non-numeric character.) To work around this, you can
-        convert to numeric units, perform the aggregate operation, and
-        convert back to a temporal value. Examples:
+        first non-numeric character.) To work around this problem, you
+        can convert to numeric units, perform the aggregate operation,
+        and convert back to a temporal value. Examples:
       </para>
 
 <programlisting>
@@ -14110,10 +14109,10 @@
             and <literal>ISAM</literal> tables only, because an exact
             row count is stored for these storage engines and can be
             accessed very quickly. For transactional storage engines
-            (<literal>InnoDB</literal>, <literal>BDB</literal>), storing
-            an exact row count is more problematic because multiple
-            transactions may be occurring, each of which may affect the
-            count.
+            such as <literal>InnoDB</literal> and
+            <literal>BDB</literal>, storing an exact row count is more
+            problematic because multiple transactions may be occurring,
+            each of which may affect the count.
           </para>
         </listitem>
 
@@ -14247,7 +14246,7 @@
             keyword. <literal>SEPARATOR</literal> is followed by the
             string value that should be inserted between values of
             result. The default is a comma
-            (&lsquo;<literal>,</literal>&rsquo;). You can remove the
+            (&lsquo;<literal>,</literal>&rsquo;). You can eliminate the
             separator altogether by specifying <literal>SEPARATOR
             ''</literal>.
           </para>

Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-4.1/innodb.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -7275,12 +7275,12 @@
         given in the error message. If you are still unable to use
         <literal>DROP TABLE</literal> successfully, the problem may be
         due to name completion in the <command>mysql</command> client.
-        To work around this, start the <command>mysql</command> client
-        with the <option>--disable-auto-rehash</option> option and try
-        <literal>DROP TABLE</literal> again. (With name completion on,
-        <command>mysql</command> tries to construct a list of table
-        names, which fails when a problem such as just described
-        exists.)
+        To work around this problem, start the <command>mysql</command>
+        client with the <option>--disable-auto-rehash</option> option
+        and try <literal>DROP TABLE</literal> again. (With name
+        completion on, <command>mysql</command> tries to construct a
+        list of table names, which fails when a problem such as just
+        described exists.)
       </para>
 
       <para>

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-4.1/installing.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -14094,10 +14094,11 @@
 </programlisting>
 
             <para>
-              To work around this, start <command>mysqld</command> by
-              using the <literal>su</literal> command rather than by
-              specifying the <option>--user</option> option. This causes
-              the system itself to change the user ID of the
+              To work around this problem, start
+              <command>mysqld</command> by using the
+              <literal>su</literal> command rather than by specifying
+              the <option>--user</option> option. This causes the system
+              itself to change the user ID of the
               <command>mysqld</command> process so that
               <command>mysqld</command> need not do so.
             </para>

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.0/data-types.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -915,9 +915,9 @@
         The <literal>SUM()</literal> and <literal>AVG()</literal>
         aggregate functions do not work with temporal values. (They
         convert the values to numbers, which loses the part after the
-        first non-numeric character.) To work around this, you can
-        convert to numeric units, perform the aggregate operation, and
-        convert back to a temporal value. Examples:
+        first non-numeric character.) To work around this problem, you
+        can convert to numeric units, perform the aggregate operation,
+        and convert back to a temporal value. Examples:
       </para>
 
 <programlisting>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.0/database-administration.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -4272,7 +4272,8 @@
 
             <para>
               The maximum allowed result length for the
-              <literal>GROUP_CONCAT()</literal> function.
+              <literal>GROUP_CONCAT()</literal> function. The default is
+              1024.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.0/functions.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -12923,28 +12923,29 @@
           <para>
             The ID that was generated is maintained in the server on a
             <emphasis>per-connection basis</emphasis>. This means that
-            the value which the function returns to a given client is
-            the first <literal>AUTO_INCREMENT</literal> value generated
-            for most recent statement affecting an
-            <literal>AUTO_INCREMENT</literal> column by that client.
-            This value cannot be affected by other clients, even if they
-            generate <literal>AUTO_INCREMENT</literal> values of their
-            own. This behavior ensures that you can retrieve your own ID
+            the value returned by the function to a given client is the
+            first <literal>AUTO_INCREMENT</literal> value generated for
+            most recent statement affecting an
+            <literal>AUTO_INCREMENT</literal> column <emphasis>by that
+            client</emphasis>. This value cannot be affected by other
+            clients, even if they generate
+            <literal>AUTO_INCREMENT</literal> values of their own. This
+            behavior ensures that each client can retrieve its own ID
             without concern for the activity of other clients, and
             without the need for locks or transactions.
           </para>
 
           <para>
             The value of <literal>LAST_INSERT_ID()</literal> is not
-            changed if you update the <literal>AUTO_INCREMENT</literal>
-            column of a row with a non-<quote>magic</quote> value (that
+            changed if you set the <literal>AUTO_INCREMENT</literal>
+            column of a row to a non-<quote>magic</quote> value (that
             is, a value that is not <literal>NULL</literal> and not
             <literal>0</literal>).
           </para>
 
           <para>
             <emphasis role="bold">Important</emphasis>: If you insert
-            mutliple rows using a single <literal>INSERT</literal>
+            multiple rows using a single <literal>INSERT</literal>
             statement, <literal>LAST_INSERT_ID()</literal> returns the
             value generated for the <emphasis>first</emphasis> inserted
             row <emphasis>only</emphasis>. The reason for this is to
@@ -12966,7 +12967,7 @@
     -&gt; <userinput>);</userinput>
 Query OK, 0 rows affected (0.09 sec)
 
-mysql&gt; <literal>INSERT INTO t VALUES (NULL, 'Bob');</literal>
+mysql&gt; <userinput>INSERT INTO t VALUES (NULL, 'Bob');</userinput>
 Query OK, 1 row affected (0.01 sec)
 
 mysql&gt; <userinput>SELECT * FROM t;</userinput>
@@ -13012,7 +13013,7 @@
 
           <para>
             Although the second <literal>INSERT</literal> statement
-            inserted 3 new rows into <literal>t</literal>, the ID
+            inserted three new rows into <literal>t</literal>, the ID
             generated for the first of these rows was
             <literal>2</literal>, and it is this value that is returned
             by <literal>LAST_INSERT_ID()</literal> for the following
@@ -13040,7 +13041,7 @@
             simulate sequences:
           </para>
 
-          <itemizedlist>
+          <orderedlist>
 
             <listitem>
               <para>
@@ -13076,7 +13077,7 @@
               </para>
             </listitem>
 
-          </itemizedlist>
+          </orderedlist>
 
           <para>
             You can generate sequences without calling
@@ -13254,7 +13255,8 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the current MySQL username and hostname.
+            Returns the current MySQL username and hostname as a string
+            in the <literal>utf8</literal> character set.
           </para>
 
           <remark role="help-description-end"/>
@@ -13415,7 +13417,7 @@
 
           <para>
             Tries to obtain a lock with a name given by the string
-            <replaceable>str</replaceable>, with a timeout of
+            <replaceable>str</replaceable>, using a timeout of
             <replaceable>timeout</replaceable> seconds. Returns
             <literal>1</literal> if the lock was obtained successfully,
             <literal>0</literal> if the attempt timed out (for example,
@@ -13517,9 +13519,9 @@
           <para>
             The generated number is always in network byte order. For
             the example just shown, the number is calculated as
-            <literal>209&times;256<superscript>3</superscript> +
+            209&times;256<superscript>3</superscript> +
             207&times;256<superscript>2</superscript> + 224&times;256 +
-            40</literal>.
+            40.
           </para>
 
           <para>
@@ -13538,9 +13540,7 @@
             recommended that you use an <literal>INT UNSIGNED</literal>
             column. If you use a (signed) <literal>INT</literal> column,
             values corresponding to IP addresses for which the first
-            octet is greater than 127 will be truncated to 2147483647
-            (that is, the value returned by
-            <literal>INET_ATON('127.255.255.255')</literal>). See
+            octet is greater than 127 cannot be stored correctly. See
             <xref linkend="numeric-types"/>.
           </para>
         </listitem>
@@ -13599,8 +13599,8 @@
             is free to use (that is, not locked). Returns
             <literal>1</literal> if the lock is free (no one is using
             the lock), <literal>0</literal> if the lock is in use, and
-            <literal>NULL</literal> on errors (such as incorrect
-            arguments).
+            <literal>NULL</literal> if an error occurs (such as an
+            incorrect argument).
           </para>
 
           <remark role="help-description-end"/>
@@ -13654,11 +13654,11 @@
             This function is useful for control of master/slave
             synchronization. It blocks until the slave has read and
             applied all updates up to the specified position in the
-            master log. The return value is the number of log events it
-            had to wait for to get to the specified position. The
-            function returns <literal>NULL</literal> if the slave SQL
-            thread is not started, the slave's master information is not
-            initialized, the arguments are incorrect, or an error
+            master log. The return value is the number of log events the
+            slave had to wait for to advance to the specified position.
+            The function returns <literal>NULL</literal> if the slave
+            SQL thread is not started, the slave's master information is
+            not initialized, the arguments are incorrect, or an error
             occurs. It returns <literal>-1</literal> if the timeout has
             been exceeded. If the slave SQL thread stops while
             <literal>MASTER_POS_WAIT()</literal> is waiting, the
@@ -13970,9 +13970,9 @@
         The <literal>SUM()</literal> and <literal>AVG()</literal>
         aggregate functions do not work with temporal values. (They
         convert the values to numbers, which loses the part after the
-        first non-numeric character.) To work around this, you can
-        convert to numeric units, perform the aggregate operation, and
-        convert back to a temporal value. Examples:
+        first non-numeric character.) To work around this problem, you
+        can convert to numeric units, perform the aggregate operation,
+        and convert back to a temporal value. Examples:
       </para>
 
 <programlisting>
@@ -14192,10 +14192,11 @@
             This optimization applies only to <literal>MyISAM</literal>
             tables only, because an exact row count is stored for this
             storage engine and can be accessed very quickly. For
-            transactional storage engines (<literal>InnoDB</literal>,
-            <literal>BDB</literal>), storing an exact row count is more
-            problematic because multiple transactions may be occurring,
-            each of which may affect the count.
+            transactional storage engines such as
+            <literal>InnoDB</literal> and <literal>BDB</literal>,
+            storing an exact row count is more problematic because
+            multiple transactions may be occurring, each of which may
+            affect the count.
           </para>
         </listitem>
 
@@ -14324,7 +14325,7 @@
             keyword. <literal>SEPARATOR</literal> is followed by the
             string value that should be inserted between values of
             result. The default is a comma
-            (&lsquo;<literal>,</literal>&rsquo;). You can remove the
+            (&lsquo;<literal>,</literal>&rsquo;). You can eliminate the
             separator altogether by specifying <literal>SEPARATOR
             ''</literal>.
           </para>

Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.0/innodb.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -7202,12 +7202,12 @@
         given in the error message. If you are still unable to use
         <literal>DROP TABLE</literal> successfully, the problem may be
         due to name completion in the <command>mysql</command> client.
-        To work around this, start the <command>mysql</command> client
-        with the <option>--disable-auto-rehash</option> option and try
-        <literal>DROP TABLE</literal> again. (With name completion on,
-        <command>mysql</command> tries to construct a list of table
-        names, which fails when a problem such as just described
-        exists.)
+        To work around this problem, start the <command>mysql</command>
+        client with the <option>--disable-auto-rehash</option> option
+        and try <literal>DROP TABLE</literal> again. (With name
+        completion on, <command>mysql</command> tries to construct a
+        list of table names, which fails when a problem such as just
+        described exists.)
       </para>
 
       <para>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.0/installing.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -13216,10 +13216,11 @@
 </programlisting>
 
             <para>
-              To work around this, start <command>mysqld</command> by
-              using the <literal>su</literal> command rather than by
-              specifying the <option>--user</option> option. This causes
-              the system itself to change the user ID of the
+              To work around this problem, start
+              <command>mysqld</command> by using the
+              <literal>su</literal> command rather than by specifying
+              the <option>--user</option> option. This causes the system
+              itself to change the user ID of the
               <command>mysqld</command> process so that
               <command>mysqld</command> need not do so.
             </para>

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.1/data-types.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -871,9 +871,9 @@
         The <literal>SUM()</literal> and <literal>AVG()</literal>
         aggregate functions do not work with temporal values. (They
         convert the values to numbers, which loses the part after the
-        first non-numeric character.) To work around this, you can
-        convert to numeric units, perform the aggregate operation, and
-        convert back to a temporal value. Examples:
+        first non-numeric character.) To work around this problem, you
+        can convert to numeric units, perform the aggregate operation,
+        and convert back to a temporal value. Examples:
       </para>
 
 <programlisting>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.1/database-administration.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -4286,7 +4286,8 @@
 
             <para>
               The maximum allowed result length for the
-              <literal>GROUP_CONCAT()</literal> function.
+              <literal>GROUP_CONCAT()</literal> function. The default is
+              1024.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.1/functions.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -13315,28 +13315,29 @@
           <para>
             The ID that was generated is maintained in the server on a
             <emphasis>per-connection basis</emphasis>. This means that
-            the value which the function returns to a given client is
-            the first <literal>AUTO_INCREMENT</literal> value generated
-            for most recent statement affecting an
-            <literal>AUTO_INCREMENT</literal> column by that client.
-            This value cannot be affected by other clients, even if they
-            generate <literal>AUTO_INCREMENT</literal> values of their
-            own. This behavior ensures that you can retrieve your own ID
+            the value returned by the function to a given client is the
+            first <literal>AUTO_INCREMENT</literal> value generated for
+            most recent statement affecting an
+            <literal>AUTO_INCREMENT</literal> column <emphasis>by that
+            client</emphasis>. This value cannot be affected by other
+            clients, even if they generate
+            <literal>AUTO_INCREMENT</literal> values of their own. This
+            behavior ensures that each client can retrieve its own ID
             without concern for the activity of other clients, and
             without the need for locks or transactions.
           </para>
 
           <para>
             The value of <literal>LAST_INSERT_ID()</literal> is not
-            changed if you update the <literal>AUTO_INCREMENT</literal>
-            column of a row with a non-<quote>magic</quote> value (that
+            changed if you set the <literal>AUTO_INCREMENT</literal>
+            column of a row to a non-<quote>magic</quote> value (that
             is, a value that is not <literal>NULL</literal> and not
             <literal>0</literal>).
           </para>
 
           <para>
             <emphasis role="bold">Important</emphasis>: If you insert
-            mutliple rows using a single <literal>INSERT</literal>
+            multiple rows using a single <literal>INSERT</literal>
             statement, <literal>LAST_INSERT_ID()</literal> returns the
             value generated for the <emphasis>first</emphasis> inserted
             row <emphasis>only</emphasis>. The reason for this is to
@@ -13358,7 +13359,7 @@
     -&gt; <userinput>);</userinput>
 Query OK, 0 rows affected (0.09 sec)
 
-mysql&gt; <literal>INSERT INTO t VALUES (NULL, 'Bob');</literal>
+mysql&gt; <userinput>INSERT INTO t VALUES (NULL, 'Bob');</userinput>
 Query OK, 1 row affected (0.01 sec)
 
 mysql&gt; <userinput>SELECT * FROM t;</userinput>
@@ -13404,7 +13405,7 @@
 
           <para>
             Although the second <literal>INSERT</literal> statement
-            inserted 3 new rows into <literal>t</literal>, the ID
+            inserted three new rows into <literal>t</literal>, the ID
             generated for the first of these rows was
             <literal>2</literal>, and it is this value that is returned
             by <literal>LAST_INSERT_ID()</literal> for the following
@@ -13432,7 +13433,7 @@
             simulate sequences:
           </para>
 
-          <itemizedlist>
+          <orderedlist>
 
             <listitem>
               <para>
@@ -13468,7 +13469,7 @@
               </para>
             </listitem>
 
-          </itemizedlist>
+          </orderedlist>
 
           <para>
             You can generate sequences without calling
@@ -13642,7 +13643,8 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the current MySQL username and hostname.
+            Returns the current MySQL username and hostname as a string
+            in the <literal>utf8</literal> character set.
           </para>
 
           <remark role="help-description-end"/>
@@ -13802,7 +13804,7 @@
 
           <para>
             Tries to obtain a lock with a name given by the string
-            <replaceable>str</replaceable>, with a timeout of
+            <replaceable>str</replaceable>, using a timeout of
             <replaceable>timeout</replaceable> seconds. Returns
             <literal>1</literal> if the lock was obtained successfully,
             <literal>0</literal> if the attempt timed out (for example,
@@ -13904,9 +13906,9 @@
           <para>
             The generated number is always in network byte order. For
             the example just shown, the number is calculated as
-            <literal>209&times;256<superscript>3</superscript> +
+            209&times;256<superscript>3</superscript> +
             207&times;256<superscript>2</superscript> + 224&times;256 +
-            40</literal>.
+            40.
           </para>
 
           <para>
@@ -13925,9 +13927,7 @@
             recommended that you use an <literal>INT UNSIGNED</literal>
             column. If you use a (signed) <literal>INT</literal> column,
             values corresponding to IP addresses for which the first
-            octet is greater than 127 will be truncated to 2147483647
-            (that is, the value returned by
-            <literal>INET_ATON('127.255.255.255')</literal>). See
+            octet is greater than 127 cannot be stored correctly. See
             <xref linkend="numeric-types"/>.
           </para>
         </listitem>
@@ -13986,8 +13986,8 @@
             is free to use (that is, not locked). Returns
             <literal>1</literal> if the lock is free (no one is using
             the lock), <literal>0</literal> if the lock is in use, and
-            <literal>NULL</literal> on errors (such as incorrect
-            arguments).
+            <literal>NULL</literal> if an error occurs (such as an
+            incorrect argument).
           </para>
 
           <remark role="help-description-end"/>
@@ -14041,11 +14041,11 @@
             This function is useful for control of master/slave
             synchronization. It blocks until the slave has read and
             applied all updates up to the specified position in the
-            master log. The return value is the number of log events it
-            had to wait for to get to the specified position. The
-            function returns <literal>NULL</literal> if the slave SQL
-            thread is not started, the slave's master information is not
-            initialized, the arguments are incorrect, or an error
+            master log. The return value is the number of log events the
+            slave had to wait for to advance to the specified position.
+            The function returns <literal>NULL</literal> if the slave
+            SQL thread is not started, the slave's master information is
+            not initialized, the arguments are incorrect, or an error
             occurs. It returns <literal>-1</literal> if the timeout has
             been exceeded. If the slave SQL thread stops while
             <literal>MASTER_POS_WAIT()</literal> is waiting, the
@@ -14357,9 +14357,9 @@
         The <literal>SUM()</literal> and <literal>AVG()</literal>
         aggregate functions do not work with temporal values. (They
         convert the values to numbers, which loses the part after the
-        first non-numeric character.) To work around this, you can
-        convert to numeric units, perform the aggregate operation, and
-        convert back to a temporal value. Examples:
+        first non-numeric character.) To work around this problem, you
+        can convert to numeric units, perform the aggregate operation,
+        and convert back to a temporal value. Examples:
       </para>
 
 <programlisting>
@@ -14579,10 +14579,11 @@
             This optimization applies only to <literal>MyISAM</literal>
             tables only, because an exact row count is stored for this
             storage engine and can be accessed very quickly. For
-            transactional storage engines (<literal>InnoDB</literal>,
-            <literal>BDB</literal>), storing an exact row count is more
-            problematic because multiple transactions may be occurring,
-            each of which may affect the count.
+            transactional storage engines such as
+            <literal>InnoDB</literal> and <literal>BDB</literal>,
+            storing an exact row count is more problematic because
+            multiple transactions may be occurring, each of which may
+            affect the count.
           </para>
         </listitem>
 
@@ -14711,7 +14712,7 @@
             keyword. <literal>SEPARATOR</literal> is followed by the
             string value that should be inserted between values of
             result. The default is a comma
-            (&lsquo;<literal>,</literal>&rsquo;). You can remove the
+            (&lsquo;<literal>,</literal>&rsquo;). You can eliminate the
             separator altogether by specifying <literal>SEPARATOR
             ''</literal>.
           </para>

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.1/innodb.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -7136,12 +7136,12 @@
         given in the error message. If you are still unable to use
         <literal>DROP TABLE</literal> successfully, the problem may be
         due to name completion in the <command>mysql</command> client.
-        To work around this, start the <command>mysql</command> client
-        with the <option>--disable-auto-rehash</option> option and try
-        <literal>DROP TABLE</literal> again. (With name completion on,
-        <command>mysql</command> tries to construct a list of table
-        names, which fails when a problem such as just described
-        exists.)
+        To work around this problem, start the <command>mysql</command>
+        client with the <option>--disable-auto-rehash</option> option
+        and try <literal>DROP TABLE</literal> again. (With name
+        completion on, <command>mysql</command> tries to construct a
+        list of table names, which fails when a problem such as just
+        described exists.)
       </para>
 
       <para>

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-22 20:08:26 UTC (rev 990)
+++ trunk/refman-5.1/installing.xml	2006-01-22 20:08:44 UTC (rev 991)
@@ -12638,10 +12638,11 @@
 </programlisting>
 
             <para>
-              To work around this, start <command>mysqld</command> by
-              using the <literal>su</literal> command rather than by
-              specifying the <option>--user</option> option. This causes
-              the system itself to change the user ID of the
+              To work around this problem, start
+              <command>mysqld</command> by using the
+              <literal>su</literal> command rather than by specifying
+              the <option>--user</option> option. This causes the system
+              itself to change the user ID of the
               <command>mysqld</command> process so that
               <command>mysqld</command> need not do so.
             </para>

Thread
svn commit - mysqldoc@docsrva: r991 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul22 Jan