List:Commits« Previous MessageNext Message »
From:paul Date:January 27 2006 4:06am
Subject:svn commit - mysqldoc@docsrva: r1057 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-27 05:06:17 +0100 (Fri, 27 Jan 2006)
New Revision: 1057

Log:
 r6729@frost:  paul | 2006-01-26 22:01:27 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-27 04:02:22 UTC (rev 1056)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-27 04:06:17 UTC (rev 1057)
@@ -10125,10 +10125,9 @@
           <literal>CREATE USER</literal> privilege or the
           <literal>DELETE</literal> privilege for the
           <literal>mysql</literal> database. Each account is named using
-          the same format as for <literal>GRANT</literal> or
-          <literal>REVOKE</literal>; for example,
-          <literal>'jeffrey'@'localhost'</literal>. The user and host
-          parts of the account name correspond to the
+          the same format as for the <literal>GRANT</literal> statement;
+          for example, <literal>'jeffrey'@'localhost'</literal>. The
+          user and host parts of the account name correspond to the
           <literal>User</literal> and <literal>Host</literal> column
           values of the <literal>user</literal> table row for the
           account.
@@ -13661,12 +13660,12 @@
 </programlisting>
 
         <para>
-          <literal>SHOW ENGINES</literal> shows you status information
-          about the storage engines. This is particularly useful for
-          checking whether a storage engine is supported, or to see what
-          the default engine is. This statement is implemented in MySQL
-          4.1.2. <literal>SHOW TABLE TYPES</literal> is a deprecated
-          synonym.
+          <literal>SHOW ENGINES</literal> displays status information
+          about the the server's storage engines. This is particularly
+          useful for checking whether a storage engine is supported, or
+          to see what the default engine is. This statement is
+          implemented in MySQL 4.1.2. <literal>SHOW TABLE
+          TYPES</literal> is a deprecated synonym.
         </para>
 
         <remark role="note">
@@ -13746,7 +13745,7 @@
 </programlisting>
 
         <para>
-          A <literal>Support</literal> value indicates whether the
+          The <literal>Support</literal> value indicates whether the
           particular storage engine is supported, and which is the
           default engine. For example, if the server is started with the
           <option>--default-table-type=InnoDB</option> option, the
@@ -13833,9 +13832,16 @@
         <remark role="help-description-begin"/>
 
         <para>
-          This statement lists the <literal>GRANT</literal> statements
-          that must be issued to duplicate the privileges that are
-          granted to a MySQL user account.
+          This statement lists the <literal>GRANT</literal> statement or
+          statements that must be issued to duplicate the privileges
+          that are granted to a MySQL user account. The account is named
+          using the same format as for the <literal>GRANT</literal>
+          statement; for example,
+          <literal>'jeffrey'@'localhost'</literal>. The user and host
+          parts of the account name correspond to the
+          <literal>User</literal> and <literal>Host</literal> column
+          values of the <literal>user</literal> table row for the
+          account.
         </para>
 
 <programlisting>
@@ -13909,8 +13915,8 @@
 </programlisting>
 
         <para>
-          <literal>SHOW INDEX</literal> returns table index information
-          in a format that resembles the
+          <literal>SHOW INDEX</literal> returns table index information.
+          The format resembles that of the
           <literal>SQLStatistics</literal> call in ODBC.
         </para>
 
@@ -14018,7 +14024,7 @@
 
             <para>
               The number of indexed characters if the column is only
-              partly indexed. <literal>NULL</literal> if the entire
+              partly indexed, <literal>NULL</literal> if the entire
               column is indexed.
             </para>
           </listitem>
@@ -14091,8 +14097,8 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SHOW INDEX FROM mytable FROM mydb;</userinput>
-mysql&gt; <userinput>SHOW INDEX FROM mydb.mytable;</userinput>
+SHOW INDEX FROM mytable FROM mydb;
+SHOW INDEX FROM mydb.mytable;
 </programlisting>
 
         <para>
@@ -14216,7 +14222,7 @@
             </para>
 
             <para>
-              Whether table name is locked. Name-locking is used for
+              Whether the table name is locked. Name locking is used for
               operations such as dropping or renaming tables.
             </para>
           </listitem>
@@ -14245,8 +14251,8 @@
         <para>
           <literal>SHOW PRIVILEGES</literal> shows the list of system
           privileges that the MySQL server supports. This statement is
-          implemented as of MySQL 4.1.0. The output depends on the
-          version of your server.
+          implemented as of MySQL 4.1.0. The exact list of privileges
+          depends on the version of your server.
         </para>
 
         <remark role="note">
@@ -14275,71 +14281,7 @@
 Privilege: Drop
 Context: Databases,Tables
 Comment: To drop databases and tables
-*************************** 6. row ***************************
-Privilege: File
-Context: File access on server
-Comment: To read and write files on the server
-*************************** 7. row ***************************
-Privilege: Grant option
-Context: Databases,Tables
-Comment: To give to other users those privileges you possess
-*************************** 8. row ***************************
-Privilege: Index
-Context: Tables
-Comment: To create or drop indexes
-*************************** 9. row ***************************
-Privilege: Insert
-Context: Tables
-Comment: To insert data into tables
-*************************** 10. row ***************************
-Privilege: Lock tables
-Context: Databases
-Comment: To use LOCK TABLES (together with SELECT privilege)
-*************************** 11. row ***************************
-Privilege: Process
-Context: Server Admin
-Comment: To view the plain text of currently executing queries
-*************************** 12. row ***************************
-Privilege: References
-Context: Databases,Tables
-Comment: To have references on tables
-*************************** 13. row ***************************
-Privilege: Reload
-Context: Server Admin
-Comment: To reload or refresh tables, logs and privileges
-*************************** 14. row ***************************
-Privilege: Replication client
-Context: Server Admin
-Comment: To ask where the slave or master servers are
-*************************** 15. row ***************************
-Privilege: Replication slave
-Context: Server Admin
-Comment: To read binary log events from the master
-*************************** 16. row ***************************
-Privilege: Select
-Context: Tables
-Comment: To retrieve rows from table
-*************************** 17. row ***************************
-Privilege: Show databases
-Context: Server Admin
-Comment: To see all databases with SHOW DATABASES
-*************************** 18. row ***************************
-Privilege: Shutdown
-Context: Server Admin
-Comment: To shutdown the server
-*************************** 19. row ***************************
-Privilege: Super
-Context: Server Admin
-Comment: To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
-*************************** 20. row ***************************
-Privilege: Update
-Context: Tables
-Comment: To update existing rows
-*************************** 21. row ***************************
-Privilege: Usage
-Context: Server Admin
-Comment: No privileges - allow connect only
-21 rows in set (0.00 sec)
+...
 </programlisting>
 
       </section>
@@ -14397,7 +14339,8 @@
           is, threads associated with the MySQL account that you are
           using). See <xref linkend="kill"/>. If you do not use the
           <literal>FULL</literal> keyword, only the first 100 characters
-          of each query are shown.
+          of each statement are shown in the <literal>Info</literal>
+          field.
         </para>
 
         <remark role="help-description-end"/>
@@ -14415,6 +14358,7 @@
         <para>
           The output of <literal>SHOW PROCESSLIST</literal> may look
           like this:
+        </para>
 
 <programlisting>
 mysql> SHOW FULL PROCESSLIST\G
@@ -14466,240 +14410,263 @@
 5 rows in set (0.00 sec)
 </programlisting>
 
+        <para>
           The columns have the following meaning:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                <literal>Id</literal>: The connection identifier
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>Id</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>User</literal>: The MySQL user who is issuing
-                the statement
-              </para>
+            <para>
+              The connection identifier
+            </para>
+          </listitem>
 
-              <para>
-                If the user is <literal>system user</literal>, it can be
-                either of these:
+          <listitem>
+            <para>
+              <literal>User</literal>
+            </para>
 
-                <itemizedlist>
+            <para>
+              The MySQL user who is issuing the statement
+            </para>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
-                    </para>
-                  </listitem>
+            <para>
+              If the user is <literal>system user</literal>, it can be
+              any of these:
+            </para>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_SLAVE_IO</literal>
-                    </para>
-                  </listitem>
+            <itemizedlist>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
-                    </para>
-                  </listitem>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
+                </para>
+              </listitem>
 
-                </itemizedlist>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_SLAVE_IO</literal>
+                </para>
+              </listitem>
 
-                For the <literal>system user</literal>, there's no host
-                specified in the <literal>Host</literal> column.
-              </para>
-            </listitem>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
+                </para>
+              </listitem>
 
-            <listitem>
-              <para>
-                <literal>Host</literal>: The host of the client issuing
-                the statement (except for <literal>system user</literal>
-                where there is no host)
-              </para>
+            </itemizedlist>
 
-              <para>
-                As of MySQL 4.0.12, <literal>SHOW PROCESSLIST</literal>
-                reports the hostname for TCP/IP connections in
-                <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
-                format to make it easier to determine which client is
-                doing what.
-              </para>
-            </listitem>
+            <para>
+              For the <literal>system user</literal>, there's no host
+              specified in the <literal>Host</literal> column.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <literal>db</literal>: The default database, if
-                selected, otherwise <literal>NULL</literal>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>Host</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>Command</literal>: The value of that column
-                corresponds to the
-                <literal>COM_<replaceable>xxx</replaceable></literal>
-                commands of the client/server protocol; see
-                <xref linkend="server-status-variables"/>
-              </para>
+            <para>
+              The hostname of the client issuing the statement (except
+              for <literal>system user</literal> where there is no host)
+            </para>
 
-              <para>
-                The <literal>Command</literal> value may be one of the
-                following: <literal>Binlog Dump</literal>,
-                <literal>Change user</literal>, <literal>Close
-                stmt</literal>, <literal>Connect</literal>,
-                <literal>Connect Out</literal>, <literal>Create
-                DB</literal>, <literal>Debug</literal>, <literal>Delayed
-                insert</literal>, <literal>Drop DB</literal>,
-                <literal>Error</literal>, <literal>Execute</literal>,
-                <literal>Fetch</literal>, <literal>Field List</literal>,
-                <literal>Init DB</literal>, <literal>Kill</literal>,
-                <literal>Long Data</literal>, <literal>Ping</literal>,
-                <literal>Prepare</literal>,
-                <literal>Processlist</literal>,
-                <literal>Query</literal>, <literal>Quit</literal>,
-                <literal>Refresh</literal>, <literal>Register
-                Slave</literal>, <literal>Reset stmt</literal>,
-                <literal>Set option</literal>,
-                <literal>Shutdown</literal>, <literal>Sleep</literal>,
-                <literal>Statistics</literal>, <literal>Table
-                Dump</literal>, <literal>Time</literal>
-              </para>
-            </listitem>
+            <para>
+              As of MySQL 4.0.12, <literal>SHOW PROCESSLIST</literal>
+              reports the hostname for TCP/IP connections in
+              <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
+              format to make it easier to determine which client is
+              doing what.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <literal>Time</literal>: The time in seconds between the
-                start of the statement or command and now
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>db</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>State</literal>: An action, event, or state
-                which can be one of the following: <literal>After
-                create</literal>, <literal>Analyzing</literal>,
-                <literal>Changing master</literal>, <literal>Checking
-                master version</literal>, <literal>Checking
-                table</literal>, <literal>Connecting to
-                master</literal>, <literal>Copying to group
-                table</literal>, <literal>Copying to tmp
-                table</literal>, <literal>Creating delayed
-                handler</literal>, <literal>Creating index</literal>,
-                <literal>Creating sort index</literal>,
-                <literal>Creating table from master dump</literal>,
-                <literal>Creating tmp table</literal>,
-                <literal>Execution of init_command</literal>,
-                <literal>FULLTEXT initialization</literal>,
-                <literal>Finished reading one binlog; switching to next
-                binlog</literal>, <literal>Flushing tables</literal>,
-                <literal>Killed</literal>, <literal>Killing
-                slave</literal>, <literal>Locked</literal>,
-                <literal>Making temp file </literal>, <literal>Opening
-                master dump table</literal>, <literal>Opening
-                table</literal>, <literal>Opening tables</literal>,
-                <literal>Processing request</literal>, <literal>Purging
-                old relay logs</literal>, <literal>Queueing master event
-                to the relay log</literal>, <literal>Reading event from
-                the relay log</literal>, <literal>Reading from
-                net</literal>, <literal>Reading master dump table
-                data</literal>, <literal>Rebuilding the index on master
-                dump table</literal>, <literal>Reconnecting after a
-                failed binlog dump request</literal>,
-                <literal>Reconnecting after a failed master event
-                read</literal>, <literal>Registering slave on
-                master</literal>, <literal>Removing
-                duplicates</literal>, <literal>Reopen tables</literal>,
-                <literal>Repair by sorting</literal>, <literal>Repair
-                done</literal>, <literal>Repair with keycache</literal>,
-                <literal>Requesting binlog dump</literal>,
-                <literal>Rolling back</literal>, <literal>Saving
-                state</literal>, <literal>Searching rows for
-                update</literal>, <literal>Sending binlog event to
-                slave</literal>, <literal>Sending data</literal>,
-                <literal>Sorting for group</literal>, <literal>Sorting
-                for order</literal>, <literal>Sorting index</literal>,
-                <literal>Sorting result</literal>, <literal>System
-                lock</literal>, <literal>Table lock</literal>,
-                <literal>Thread initialized</literal>,
-                <literal>Updating</literal>, <literal>User
-                lock</literal>, <literal>Waiting for INSERT</literal>,
-                <literal>Waiting for master to send event</literal>,
-                <literal>Waiting for master update</literal>,
-                <literal>Waiting for slave mutex on exit</literal>,
-                <literal>Waiting for table</literal>, <literal>Waiting
-                for tables</literal>, <literal>Waiting for the next
-                event in relay log</literal>, <literal>Waiting on
-                cond</literal>, <literal>Waiting to finalize
-                termination</literal>, <literal>Waiting to reconnect
-                after a failed binlog dump request</literal>,
-                <literal>Waiting to reconnect after a failed master
-                event read</literal>, <literal>Writing to net</literal>,
-                <literal>allocating local table</literal>,
-                <literal>cleaning up</literal>, <literal>closing
-                tables</literal>, <literal>converting HEAP to
-                MyISAM</literal>, <literal>copy to tmp table</literal>,
-                <literal>creating table</literal>, <literal>deleting
-                from main table</literal>, <literal>deleting from
-                reference tables</literal>,
-                <literal>discard_or_import_tablespace</literal>,
-                <literal>end</literal>, <literal>freeing
-                items</literal>, <literal>got handler lock</literal>,
-                <literal>got old table</literal>,
-                <literal>info</literal>, <literal>init</literal>,
-                <literal>insert</literal>, <literal>logging slow
-                query</literal>, <literal>login</literal>,
-                <literal>preparing</literal>, <literal>purging old relay
-                logs</literal>, <literal>query end</literal>,
-                <literal>removing tmp table</literal>,
-                <literal>rename</literal>, <literal>rename result
-                table</literal>, <literal>reschedule</literal>,
-                <literal>setup</literal>, <literal>starting
-                slave</literal>, <literal>statistics</literal>,
-                <literal>storing row into queue</literal>,
-                <literal>update</literal>, <literal>updating</literal>,
-                <literal>updating main table</literal>,
-                <literal>updating reference tables</literal>,
-                <literal>upgrading lock</literal>, <literal>waiting for
-                delay_list</literal>, <literal>waiting for handler
-                insert</literal>, <literal>waiting for handler
-                lock</literal>, <literal>waiting for handler
-                open</literal>
-              </para>
+            <para>
+              The default database, if one is selected, otherwise
+              <literal>NULL</literal>
+            </para>
+          </listitem>
 
-              <para>
-                The most common <literal>State</literal> values are
-                described in the rest of this section. Most of the other
-                <literal>State</literal> values are useful only for
-                finding bugs in the server.
-              </para>
+          <listitem>
+            <para>
+              <literal>Command</literal>
+            </para>
 
-              <para>
-                For the <literal>SHOW PROCESSLIST</literal> statement,
-                the value of <literal>State</literal> is
-                <literal>NULL</literal>.
-              </para>
-            </listitem>
+            <para>
+              The value of that column corresponds to the
+              <literal>COM_<replaceable>xxx</replaceable></literal>
+              commands of the client/server protocol; see
+              <xref linkend="server-status-variables"/>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>Info</literal>: The query that the thread was
-                issuing, but only if that query was still running by the
-                time <literal>SHOW PROCESSLIST</literal> was issued
-                (this is always the case for the <literal>SHOW
-                PROCESSLIST</literal> statement itself, and for
-                long-running queries)
-              </para>
-            </listitem>
+            <para>
+              The <literal>Command</literal> value may be one of the
+              following: <literal>Binlog Dump</literal>, <literal>Change
+              user</literal>, <literal>Close stmt</literal>,
+              <literal>Connect</literal>, <literal>Connect
+              Out</literal>, <literal>Create DB</literal>,
+              <literal>Debug</literal>, <literal>Delayed
+              insert</literal>, <literal>Drop DB</literal>,
+              <literal>Error</literal>, <literal>Execute</literal>,
+              <literal>Fetch</literal>, <literal>Field List</literal>,
+              <literal>Init DB</literal>, <literal>Kill</literal>,
+              <literal>Long Data</literal>, <literal>Ping</literal>,
+              <literal>Prepare</literal>,
+              <literal>Processlist</literal>, <literal>Query</literal>,
+              <literal>Quit</literal>, <literal>Refresh</literal>,
+              <literal>Register Slave</literal>, <literal>Reset
+              stmt</literal>, <literal>Set option</literal>,
+              <literal>Shutdown</literal>, <literal>Sleep</literal>,
+              <literal>Statistics</literal>, <literal>Table
+              Dump</literal>, <literal>Time</literal>
+            </para>
+          </listitem>
 
-          </itemizedlist>
-        </para>
+          <listitem>
+            <para>
+              <literal>Time</literal>
+            </para>
 
+            <para>
+              The time in seconds between the start of the statement or
+              command and now
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>State</literal>
+            </para>
+
+            <para>
+              An action, event, or state which can be one of the
+              following: <literal>After create</literal>,
+              <literal>Analyzing</literal>, <literal>Changing
+              master</literal>, <literal>Checking master
+              version</literal>, <literal>Checking table</literal>,
+              <literal>Connecting to master</literal>, <literal>Copying
+              to group table</literal>, <literal>Copying to tmp
+              table</literal>, <literal>Creating delayed
+              handler</literal>, <literal>Creating index</literal>,
+              <literal>Creating sort index</literal>, <literal>Creating
+              table from master dump</literal>, <literal>Creating tmp
+              table</literal>, <literal>Execution of
+              init_command</literal>, <literal>FULLTEXT
+              initialization</literal>, <literal>Finished reading one
+              binlog; switching to next binlog</literal>,
+              <literal>Flushing tables</literal>,
+              <literal>Killed</literal>, <literal>Killing
+              slave</literal>, <literal>Locked</literal>,
+              <literal>Making temp file </literal>, <literal>Opening
+              master dump table</literal>, <literal>Opening
+              table</literal>, <literal>Opening tables</literal>,
+              <literal>Processing request</literal>, <literal>Purging
+              old relay logs</literal>, <literal>Queueing master event
+              to the relay log</literal>, <literal>Reading event from
+              the relay log</literal>, <literal>Reading from
+              net</literal>, <literal>Reading master dump table
+              data</literal>, <literal>Rebuilding the index on master
+              dump table</literal>, <literal>Reconnecting after a failed
+              binlog dump request</literal>, <literal>Reconnecting after
+              a failed master event read</literal>, <literal>Registering
+              slave on master</literal>, <literal>Removing
+              duplicates</literal>, <literal>Reopen tables</literal>,
+              <literal>Repair by sorting</literal>, <literal>Repair
+              done</literal>, <literal>Repair with keycache</literal>,
+              <literal>Requesting binlog dump</literal>,
+              <literal>Rolling back</literal>, <literal>Saving
+              state</literal>, <literal>Searching rows for
+              update</literal>, <literal>Sending binlog event to
+              slave</literal>, <literal>Sending data</literal>,
+              <literal>Sorting for group</literal>, <literal>Sorting for
+              order</literal>, <literal>Sorting index</literal>,
+              <literal>Sorting result</literal>, <literal>System
+              lock</literal>, <literal>Table lock</literal>,
+              <literal>Thread initialized</literal>,
+              <literal>Updating</literal>, <literal>User lock</literal>,
+              <literal>Waiting for INSERT</literal>, <literal>Waiting
+              for master to send event</literal>, <literal>Waiting for
+              master update</literal>, <literal>Waiting for slave mutex
+              on exit</literal>, <literal>Waiting for table</literal>,
+              <literal>Waiting for tables</literal>, <literal>Waiting
+              for the next event in relay log</literal>,
+              <literal>Waiting on cond</literal>, <literal>Waiting to
+              finalize termination</literal>, <literal>Waiting to
+              reconnect after a failed binlog dump request</literal>,
+              <literal>Waiting to reconnect after a failed master event
+              read</literal>, <literal>Writing to net</literal>,
+              <literal>allocating local table</literal>,
+              <literal>cleaning up</literal>, <literal>closing
+              tables</literal>, <literal>converting HEAP to
+              MyISAM</literal>, <literal>copy to tmp table</literal>,
+              <literal>creating table</literal>, <literal>deleting from
+              main table</literal>, <literal>deleting from reference
+              tables</literal>,
+              <literal>discard_or_import_tablespace</literal>,
+              <literal>end</literal>, <literal>freeing items</literal>,
+              <literal>got handler lock</literal>, <literal>got old
+              table</literal>, <literal>info</literal>,
+              <literal>init</literal>, <literal>insert</literal>,
+              <literal>logging slow query</literal>,
+              <literal>login</literal>, <literal>preparing</literal>,
+              <literal>purging old relay logs</literal>, <literal>query
+              end</literal>, <literal>removing tmp table</literal>,
+              <literal>rename</literal>, <literal>rename result
+              table</literal>, <literal>reschedule</literal>,
+              <literal>setup</literal>, <literal>starting
+              slave</literal>, <literal>statistics</literal>,
+              <literal>storing row into queue</literal>,
+              <literal>update</literal>, <literal>updating</literal>,
+              <literal>updating main table</literal>, <literal>updating
+              reference tables</literal>, <literal>upgrading
+              lock</literal>, <literal>waiting for delay_list</literal>,
+              <literal>waiting for handler insert</literal>,
+              <literal>waiting for handler lock</literal>,
+              <literal>waiting for handler open</literal>
+            </para>
+
+            <para>
+              The most common <literal>State</literal> values are
+              described in the rest of this section. Most of the other
+              <literal>State</literal> values are useful only for
+              finding bugs in the server.
+            </para>
+
+            <para>
+              For the <literal>SHOW PROCESSLIST</literal> statement, the
+              value of <literal>State</literal> is
+              <literal>NULL</literal>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>Info</literal>
+            </para>
+
+            <para>
+              The statement that the thread is executing, or
+              <literal>NULL</literal> if it is not executing any
+              statement.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
         <para>
-          Some states commonly seen in the output from <literal>SHOW
-          PROCESSLIST</literal>:
+          Some <literal>State</literal> values commonly seen in the
+          output from <literal>SHOW PROCESSLIST</literal>:
         </para>
 
         <itemizedlist>
@@ -14710,8 +14677,7 @@
             </para>
 
             <para>
-              The thread is performing (automatic) checking of the
-              table.
+              The thread is performing a table check operation.
             </para>
           </listitem>
 
@@ -14734,7 +14700,7 @@
             </para>
 
             <para>
-              Slave connecting to master.
+              A replication slave is connecting to its master.
             </para>
           </listitem>
 
@@ -14990,6 +14956,15 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <literal>System lock</literal>
             </para>
 
@@ -15019,7 +14994,7 @@
             </para>
 
             <para>
-              The thread is searching for rows to update and updating
+              The thread is searching for rows to update and is updating
               them.
             </para>
           </listitem>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-27 04:02:22 UTC (rev 1056)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-27 04:06:17 UTC (rev 1057)
@@ -11085,7 +11085,14 @@
           <literal>mysql</literal> database. For each account,
           <literal>CREATE USER</literal> creates a new record in the
           <literal>mysql.user</literal> table that has no privileges. An
-          error occurs if the account already exists.
+          error occurs if the account already exists. Each account is
+          named using the same format as for the
+          <literal>GRANT</literal> statement; for example,
+          <literal>'jeffrey'@'localhost'</literal>. The user and host
+          parts of the account name correspond to the
+          <literal>User</literal> and <literal>Host</literal> column
+          values of the <literal>user</literal> table row for the
+          account.
         </para>
 
         <para>
@@ -11168,10 +11175,9 @@
           <literal>CREATE USER</literal> privilege or the
           <literal>DELETE</literal> privilege for the
           <literal>mysql</literal> database. Each account is named using
-          the same format as for <literal>GRANT</literal> or
-          <literal>REVOKE</literal>; for example,
-          <literal>'jeffrey'@'localhost'</literal>. The user and host
-          parts of the account name correspond to the
+          the same format as for the <literal>GRANT</literal> statement;
+          for example, <literal>'jeffrey'@'localhost'</literal>. The
+          user and host parts of the account name correspond to the
           <literal>User</literal> and <literal>Host</literal> column
           values of the <literal>user</literal> table row for the
           account.
@@ -12386,10 +12392,14 @@
           <literal>CREATE USER</literal> privilege or the
           <literal>UPDATE</literal> privilege for the
           <literal>mysql</literal> database. An error occurs if any old
-          account does not exist or any new account exists. The
-          <replaceable>old_user</replaceable> and
-          <replaceable>new_user</replaceable> values are given the same
-          way as for the <literal>GRANT</literal> statement.
+          account does not exist or any new account exists. Each account
+          is named using the same format as for the
+          <literal>GRANT</literal> statement; for example,
+          <literal>'jeffrey'@'localhost'</literal>. The user and host
+          parts of the account name correspond to the
+          <literal>User</literal> and <literal>Host</literal> column
+          values of the <literal>user</literal> table row for the
+          account.
         </para>
 
         <remark role="help-description-end"/>
@@ -14874,10 +14884,6 @@
           STATUS</literal>.
         </para>
 
-        <para>
-          <literal>SHOW ENGINE</literal> can be used as of MySQL 4.1.2.
-        </para>
-
       </section>
 
       <section id="show-engines">
@@ -14901,11 +14907,11 @@
 </programlisting>
 
         <para>
-          <literal>SHOW ENGINES</literal> shows you status information
-          about the storage engines. This is particularly useful for
-          checking whether a storage engine is supported, or to see what
-          the default engine is. <literal>SHOW TABLE TYPES</literal> is
-          a deprecated synonym.
+          <literal>SHOW ENGINES</literal> displays status information
+          about the server's storage engines. This is particularly
+          useful for checking whether a storage engine is supported, or
+          to see what the default engine is. <literal>SHOW TABLE
+          TYPES</literal> is a deprecated synonym.
         </para>
 
         <remark>
@@ -14989,7 +14995,7 @@
 </programlisting>
 
         <para>
-          A <literal>Support</literal> value indicates whether the
+          The <literal>Support</literal> value indicates whether the
           particular storage engine is supported, and which is the
           default engine. For example, if the server is started with the
           <option>--default-table-type=InnoDB</option> option, the
@@ -15075,9 +15081,16 @@
         <remark role="help-description-begin"/>
 
         <para>
-          This statement lists the <literal>GRANT</literal> statements
-          that must be issued to duplicate the privileges that are
-          granted to a MySQL user account.
+          This statement lists the <literal>GRANT</literal> statement or
+          statements that must be issued to duplicate the privileges
+          that are granted to a MySQL user account. The account is named
+          using the same format as for the <literal>GRANT</literal>
+          statement; for example,
+          <literal>'jeffrey'@'localhost'</literal>. The user and host
+          parts of the account name correspond to the
+          <literal>User</literal> and <literal>Host</literal> column
+          values of the <literal>user</literal> table row for the
+          account.
         </para>
 
 <programlisting>
@@ -15137,8 +15150,8 @@
 </programlisting>
 
         <para>
-          <literal>SHOW INDEX</literal> returns table index information
-          in a format that resembles the
+          <literal>SHOW INDEX</literal> returns table index information.
+          The format resembles that of the
           <literal>SQLStatistics</literal> call in ODBC.
         </para>
 
@@ -15246,7 +15259,7 @@
 
             <para>
               The number of indexed characters if the column is only
-              partly indexed. <literal>NULL</literal> if the entire
+              partly indexed, <literal>NULL</literal> if the entire
               column is indexed.
             </para>
           </listitem>
@@ -15309,8 +15322,8 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SHOW INDEX FROM mytable FROM mydb;</userinput>
-mysql&gt; <userinput>SHOW INDEX FROM mydb.mytable;</userinput>
+SHOW INDEX FROM mytable FROM mydb;
+SHOW INDEX FROM mydb.mytable;
 </programlisting>
 
         <para>
@@ -15423,7 +15436,7 @@
             </para>
 
             <para>
-              Whether table name is locked. Name-locking is used for
+              Whether the table name is locked. Name locking is used for
               operations such as dropping or renaming tables.
             </para>
           </listitem>
@@ -15451,8 +15464,8 @@
 
         <para>
           <literal>SHOW PRIVILEGES</literal> shows the list of system
-          privileges that the MySQL server supports. The exact output
-          depends on the version of your server.
+          privileges that the MySQL server supports. The exact list of
+          privileges depends on the version of your server.
         </para>
 
         <remark>
@@ -15481,94 +15494,7 @@
 Privilege: Create temporary tables
 Context: Databases
 Comment: To use CREATE TEMPORARY TABLE
-*************************** 6. row ***************************
-Privilege: Create view
-Context: Tables
-Comment: To create new views
-*************************** 7. row ***************************
-Privilege: Create user
-Context: Server Admin
-Comment: To create new users
-*************************** 8. row ***************************
-Privilege: Delete
-Context: Tables
-Comment: To delete existing rows
-*************************** 9. row ***************************
-Privilege: Drop
-Context: Databases,Tables
-Comment: To drop databases, tables, and views
-*************************** 10. row ***************************
-Privilege: Execute
-Context: Functions,Procedures
-Comment: To execute stored routines
-*************************** 11. row ***************************
-Privilege: File
-Context: File access on server
-Comment: To read and write files on the server
-*************************** 12. row ***************************
-Privilege: Grant option
-Context: Databases,Tables,Functions,Procedures
-Comment: To give to other users those privileges you possess
-*************************** 13. row ***************************
-Privilege: Index
-Context: Tables
-Comment: To create or drop indexes
-*************************** 14. row ***************************
-Privilege: Insert
-Context: Tables
-Comment: To insert data into tables
-*************************** 15. row ***************************
-Privilege: Lock tables
-Context: Databases
-Comment: To use LOCK TABLES (together with SELECT privilege)
-*************************** 16. row ***************************
-Privilege: Process
-Context: Server Admin
-Comment: To view the plain text of currently executing queries
-*************************** 17. row ***************************
-Privilege: References
-Context: Databases,Tables
-Comment: To have references on tables
-*************************** 18. row ***************************
-Privilege: Reload
-Context: Server Admin
-Comment: To reload or refresh tables, logs and privileges
-*************************** 19. row ***************************
-Privilege: Replication client
-Context: Server Admin
-Comment: To ask where the slave or master servers are
-*************************** 20. row ***************************
-Privilege: Replication slave
-Context: Server Admin
-Comment: To read binary log events from the master
-*************************** 21. row ***************************
-Privilege: Select
-Context: Tables
-Comment: To retrieve rows from table
-*************************** 22. row ***************************
-Privilege: Show databases
-Context: Server Admin
-Comment: To see all databases with SHOW DATABASES
-*************************** 23. row ***************************
-Privilege: Show view
-Context: Tables
-Comment: To see views with SHOW CREATE VIEW
-*************************** 24. row ***************************
-Privilege: Shutdown
-Context: Server Admin
-Comment: To shut down the server
-*************************** 25. row ***************************
-Privilege: Super
-Context: Server Admin
-Comment: To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
-*************************** 26. row ***************************
-Privilege: Update
-Context: Tables
-Comment: To update existing rows
-*************************** 27. row ***************************
-Privilege: Usage
-Context: Server Admin
-Comment: No privileges - allow connect only
+...
 </programlisting>
 
       </section>
@@ -15626,7 +15552,8 @@
           is, threads associated with the MySQL account that you are
           using). See <xref linkend="kill"/>. If you do not use the
           <literal>FULL</literal> keyword, only the first 100 characters
-          of each query are shown.
+          of each statement are shown in the <literal>Info</literal>
+          field.
         </para>
 
         <remark role="help-description-end"/>
@@ -15644,6 +15571,7 @@
         <para>
           The output of <literal>SHOW PROCESSLIST</literal> may look
           like this:
+        </para>
 
 <programlisting>
 mysql> SHOW FULL PROCESSLIST\G
@@ -15695,240 +15623,263 @@
 5 rows in set (0.00 sec)
 </programlisting>
 
+        <para>
           The columns have the following meaning:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                <literal>Id</literal>: The connection identifier
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>Id</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>User</literal>: The MySQL user who is issuing
-                the statement
-              </para>
+            <para>
+              The connection identifier
+            </para>
+          </listitem>
 
-              <para>
-                If the user is <literal>system user</literal>, it can be
-                either of these:
+          <listitem>
+            <para>
+              <literal>User</literal>
+            </para>
 
-                <itemizedlist>
+            <para>
+              The MySQL user who is issuing the statement
+            </para>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
-                    </para>
-                  </listitem>
+            <para>
+              If the user is <literal>system user</literal>, it can be
+              any of these:
+            </para>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_SLAVE_IO</literal>
-                    </para>
-                  </listitem>
+            <itemizedlist>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
-                    </para>
-                  </listitem>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
+                </para>
+              </listitem>
 
-                </itemizedlist>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_SLAVE_IO</literal>
+                </para>
+              </listitem>
 
-                For the <literal>system user</literal>, there's no host
-                specified in the <literal>Host</literal> column.
-              </para>
-            </listitem>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
+                </para>
+              </listitem>
 
-            <listitem>
-              <para>
-                <literal>Host</literal>: The host of the client issuing
-                the statement (except for <literal>system user</literal>
-                where there is no host)
-              </para>
+            </itemizedlist>
 
-              <para>
-                <literal>SHOW PROCESSLIST</literal> reports the hostname
-                for TCP/IP connections in
-                <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
-                format to make it easier to determine which client is
-                doing what.
-              </para>
-            </listitem>
+            <para>
+              For the <literal>system user</literal>, there's no host
+              specified in the <literal>Host</literal> column.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <literal>db</literal>: The default database, if
-                selected, otherwise <literal>NULL</literal>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>Host</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>Command</literal>: The value of that column
-                corresponds to the
-                <literal>COM_<replaceable>xxx</replaceable></literal>
-                commands of the client/server protocol; see
-                <xref linkend="server-status-variables"/>
-              </para>
+            <para>
+              The hostname of the client issuing the statement (except
+              for <literal>system user</literal> where there is no host)
+            </para>
 
-              <para>
-                The <literal>Command</literal> value may be one of the
-                following: <literal>Binlog Dump</literal>,
-                <literal>Change user</literal>, <literal>Close
-                stmt</literal>, <literal>Connect</literal>,
-                <literal>Connect Out</literal>, <literal>Create
-                DB</literal>, <literal>Debug</literal>, <literal>Delayed
-                insert</literal>, <literal>Drop DB</literal>,
-                <literal>Error</literal>, <literal>Execute</literal>,
-                <literal>Fetch</literal>, <literal>Field List</literal>,
-                <literal>Init DB</literal>, <literal>Kill</literal>,
-                <literal>Long Data</literal>, <literal>Ping</literal>,
-                <literal>Prepare</literal>,
-                <literal>Processlist</literal>,
-                <literal>Query</literal>, <literal>Quit</literal>,
-                <literal>Refresh</literal>, <literal>Register
-                Slave</literal>, <literal>Reset stmt</literal>,
-                <literal>Set option</literal>,
-                <literal>Shutdown</literal>, <literal>Sleep</literal>,
-                <literal>Statistics</literal>, <literal>Table
-                Dump</literal>, <literal>Time</literal>
-              </para>
-            </listitem>
+            <para>
+              <literal>SHOW PROCESSLIST</literal> reports the hostname
+              for TCP/IP connections in
+              <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
+              format to make it easier to determine which client is
+              doing what.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <literal>Time</literal>: The time in seconds between the
-                start of the statement or command and now
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>db</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>State</literal>: An action, event, or state
-                which can be one of the following: <literal>After
-                create</literal>, <literal>Analyzing</literal>,
-                <literal>Changing master</literal>, <literal>Checking
-                master version</literal>, <literal>Checking
-                table</literal>, <literal>Connecting to
-                master</literal>, <literal>Copying to group
-                table</literal>, <literal>Copying to tmp
-                table</literal>, <literal>Creating delayed
-                handler</literal>, <literal>Creating index</literal>,
-                <literal>Creating sort index</literal>,
-                <literal>Creating table from master dump</literal>,
-                <literal>Creating tmp table</literal>,
-                <literal>Execution of init_command</literal>,
-                <literal>FULLTEXT initialization</literal>,
-                <literal>Finished reading one binlog; switching to next
-                binlog</literal>, <literal>Flushing tables</literal>,
-                <literal>Killed</literal>, <literal>Killing
-                slave</literal>, <literal>Locked</literal>,
-                <literal>Making temp file </literal>, <literal>Opening
-                master dump table</literal>, <literal>Opening
-                table</literal>, <literal>Opening tables</literal>,
-                <literal>Processing request</literal>, <literal>Purging
-                old relay logs</literal>, <literal>Queueing master event
-                to the relay log</literal>, <literal>Reading event from
-                the relay log</literal>, <literal>Reading from
-                net</literal>, <literal>Reading master dump table
-                data</literal>, <literal>Rebuilding the index on master
-                dump table</literal>, <literal>Reconnecting after a
-                failed binlog dump request</literal>,
-                <literal>Reconnecting after a failed master event
-                read</literal>, <literal>Registering slave on
-                master</literal>, <literal>Removing
-                duplicates</literal>, <literal>Reopen tables</literal>,
-                <literal>Repair by sorting</literal>, <literal>Repair
-                done</literal>, <literal>Repair with keycache</literal>,
-                <literal>Requesting binlog dump</literal>,
-                <literal>Rolling back</literal>, <literal>Saving
-                state</literal>, <literal>Searching rows for
-                update</literal>, <literal>Sending binlog event to
-                slave</literal>, <literal>Sending data</literal>,
-                <literal>Sorting for group</literal>, <literal>Sorting
-                for order</literal>, <literal>Sorting index</literal>,
-                <literal>Sorting result</literal>, <literal>System
-                lock</literal>, <literal>Table lock</literal>,
-                <literal>Thread initialized</literal>,
-                <literal>Updating</literal>, <literal>User
-                lock</literal>, <literal>Waiting for INSERT</literal>,
-                <literal>Waiting for master to send event</literal>,
-                <literal>Waiting for master update</literal>,
-                <literal>Waiting for slave mutex on exit</literal>,
-                <literal>Waiting for table</literal>, <literal>Waiting
-                for tables</literal>, <literal>Waiting for the next
-                event in relay log</literal>, <literal>Waiting on
-                cond</literal>, <literal>Waiting to finalize
-                termination</literal>, <literal>Waiting to reconnect
-                after a failed binlog dump request</literal>,
-                <literal>Waiting to reconnect after a failed master
-                event read</literal>, <literal>Writing to net</literal>,
-                <literal>allocating local table</literal>,
-                <literal>cleaning up</literal>, <literal>closing
-                tables</literal>, <literal>converting HEAP to
-                MyISAM</literal>, <literal>copy to tmp table</literal>,
-                <literal>creating table</literal>, <literal>deleting
-                from main table</literal>, <literal>deleting from
-                reference tables</literal>,
-                <literal>discard_or_import_tablespace</literal>,
-                <literal>end</literal>, <literal>freeing
-                items</literal>, <literal>got handler lock</literal>,
-                <literal>got old table</literal>,
-                <literal>info</literal>, <literal>init</literal>,
-                <literal>insert</literal>, <literal>logging slow
-                query</literal>, <literal>login</literal>,
-                <literal>preparing</literal>, <literal>purging old relay
-                logs</literal>, <literal>query end</literal>,
-                <literal>removing tmp table</literal>,
-                <literal>rename</literal>, <literal>rename result
-                table</literal>, <literal>reschedule</literal>,
-                <literal>setup</literal>, <literal>starting
-                slave</literal>, <literal>statistics</literal>,
-                <literal>storing row into queue</literal>,
-                <literal>update</literal>, <literal>updating</literal>,
-                <literal>updating main table</literal>,
-                <literal>updating reference tables</literal>,
-                <literal>upgrading lock</literal>, <literal>waiting for
-                delay_list</literal>, <literal>waiting for handler
-                insert</literal>, <literal>waiting for handler
-                lock</literal>, <literal>waiting for handler
-                open</literal>
-              </para>
+            <para>
+              The default database, if one is selected, otherwise
+              <literal>NULL</literal>
+            </para>
+          </listitem>
 
-              <para>
-                The most common <literal>State</literal> values are
-                described in the rest of this section. Most of the other
-                <literal>State</literal> values are useful only for
-                finding bugs in the server.
-              </para>
+          <listitem>
+            <para>
+              <literal>Command</literal>
+            </para>
 
-              <para>
-                For the <literal>SHOW PROCESSLIST</literal> statement,
-                the value of <literal>State</literal> is
-                <literal>NULL</literal>.
-              </para>
-            </listitem>
+            <para>
+              The value of that column corresponds to the
+              <literal>COM_<replaceable>xxx</replaceable></literal>
+              commands of the client/server protocol; see
+              <xref linkend="server-status-variables"/>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>Info</literal>: The query that the thread was
-                issuing, but only if that query was still running by the
-                time <literal>SHOW PROCESSLIST</literal> was issued
-                (this is always the case for the <literal>SHOW
-                PROCESSLIST</literal> statement itself, and for
-                long-running queries)
-              </para>
-            </listitem>
+            <para>
+              The <literal>Command</literal> value may be one of the
+              following: <literal>Binlog Dump</literal>, <literal>Change
+              user</literal>, <literal>Close stmt</literal>,
+              <literal>Connect</literal>, <literal>Connect
+              Out</literal>, <literal>Create DB</literal>,
+              <literal>Debug</literal>, <literal>Delayed
+              insert</literal>, <literal>Drop DB</literal>,
+              <literal>Error</literal>, <literal>Execute</literal>,
+              <literal>Fetch</literal>, <literal>Field List</literal>,
+              <literal>Init DB</literal>, <literal>Kill</literal>,
+              <literal>Long Data</literal>, <literal>Ping</literal>,
+              <literal>Prepare</literal>,
+              <literal>Processlist</literal>, <literal>Query</literal>,
+              <literal>Quit</literal>, <literal>Refresh</literal>,
+              <literal>Register Slave</literal>, <literal>Reset
+              stmt</literal>, <literal>Set option</literal>,
+              <literal>Shutdown</literal>, <literal>Sleep</literal>,
+              <literal>Statistics</literal>, <literal>Table
+              Dump</literal>, <literal>Time</literal>
+            </para>
+          </listitem>
 
-          </itemizedlist>
-        </para>
+          <listitem>
+            <para>
+              <literal>Time</literal>
+            </para>
 
+            <para>
+              The time in seconds between the start of the statement or
+              command and now
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>State</literal>
+            </para>
+
+            <para>
+              An action, event, or state which can be one of the
+              following: <literal>After create</literal>,
+              <literal>Analyzing</literal>, <literal>Changing
+              master</literal>, <literal>Checking master
+              version</literal>, <literal>Checking table</literal>,
+              <literal>Connecting to master</literal>, <literal>Copying
+              to group table</literal>, <literal>Copying to tmp
+              table</literal>, <literal>Creating delayed
+              handler</literal>, <literal>Creating index</literal>,
+              <literal>Creating sort index</literal>, <literal>Creating
+              table from master dump</literal>, <literal>Creating tmp
+              table</literal>, <literal>Execution of
+              init_command</literal>, <literal>FULLTEXT
+              initialization</literal>, <literal>Finished reading one
+              binlog; switching to next binlog</literal>,
+              <literal>Flushing tables</literal>,
+              <literal>Killed</literal>, <literal>Killing
+              slave</literal>, <literal>Locked</literal>,
+              <literal>Making temp file </literal>, <literal>Opening
+              master dump table</literal>, <literal>Opening
+              table</literal>, <literal>Opening tables</literal>,
+              <literal>Processing request</literal>, <literal>Purging
+              old relay logs</literal>, <literal>Queueing master event
+              to the relay log</literal>, <literal>Reading event from
+              the relay log</literal>, <literal>Reading from
+              net</literal>, <literal>Reading master dump table
+              data</literal>, <literal>Rebuilding the index on master
+              dump table</literal>, <literal>Reconnecting after a failed
+              binlog dump request</literal>, <literal>Reconnecting after
+              a failed master event read</literal>, <literal>Registering
+              slave on master</literal>, <literal>Removing
+              duplicates</literal>, <literal>Reopen tables</literal>,
+              <literal>Repair by sorting</literal>, <literal>Repair
+              done</literal>, <literal>Repair with keycache</literal>,
+              <literal>Requesting binlog dump</literal>,
+              <literal>Rolling back</literal>, <literal>Saving
+              state</literal>, <literal>Searching rows for
+              update</literal>, <literal>Sending binlog event to
+              slave</literal>, <literal>Sending data</literal>,
+              <literal>Sorting for group</literal>, <literal>Sorting for
+              order</literal>, <literal>Sorting index</literal>,
+              <literal>Sorting result</literal>, <literal>System
+              lock</literal>, <literal>Table lock</literal>,
+              <literal>Thread initialized</literal>,
+              <literal>Updating</literal>, <literal>User lock</literal>,
+              <literal>Waiting for INSERT</literal>, <literal>Waiting
+              for master to send event</literal>, <literal>Waiting for
+              master update</literal>, <literal>Waiting for slave mutex
+              on exit</literal>, <literal>Waiting for table</literal>,
+              <literal>Waiting for tables</literal>, <literal>Waiting
+              for the next event in relay log</literal>,
+              <literal>Waiting on cond</literal>, <literal>Waiting to
+              finalize termination</literal>, <literal>Waiting to
+              reconnect after a failed binlog dump request</literal>,
+              <literal>Waiting to reconnect after a failed master event
+              read</literal>, <literal>Writing to net</literal>,
+              <literal>allocating local table</literal>,
+              <literal>cleaning up</literal>, <literal>closing
+              tables</literal>, <literal>converting HEAP to
+              MyISAM</literal>, <literal>copy to tmp table</literal>,
+              <literal>creating table</literal>, <literal>deleting from
+              main table</literal>, <literal>deleting from reference
+              tables</literal>,
+              <literal>discard_or_import_tablespace</literal>,
+              <literal>end</literal>, <literal>freeing items</literal>,
+              <literal>got handler lock</literal>, <literal>got old
+              table</literal>, <literal>info</literal>,
+              <literal>init</literal>, <literal>insert</literal>,
+              <literal>logging slow query</literal>,
+              <literal>login</literal>, <literal>preparing</literal>,
+              <literal>purging old relay logs</literal>, <literal>query
+              end</literal>, <literal>removing tmp table</literal>,
+              <literal>rename</literal>, <literal>rename result
+              table</literal>, <literal>reschedule</literal>,
+              <literal>setup</literal>, <literal>starting
+              slave</literal>, <literal>statistics</literal>,
+              <literal>storing row into queue</literal>,
+              <literal>update</literal>, <literal>updating</literal>,
+              <literal>updating main table</literal>, <literal>updating
+              reference tables</literal>, <literal>upgrading
+              lock</literal>, <literal>waiting for delay_list</literal>,
+              <literal>waiting for handler insert</literal>,
+              <literal>waiting for handler lock</literal>,
+              <literal>waiting for handler open</literal>
+            </para>
+
+            <para>
+              The most common <literal>State</literal> values are
+              described in the rest of this section. Most of the other
+              <literal>State</literal> values are useful only for
+              finding bugs in the server.
+            </para>
+
+            <para>
+              For the <literal>SHOW PROCESSLIST</literal> statement, the
+              value of <literal>State</literal> is
+              <literal>NULL</literal>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>Info</literal>
+            </para>
+
+            <para>
+              The statement that the thread is executing, or
+              <literal>NULL</literal> if it is not executing any
+              statement.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
         <para>
-          Some states commonly seen in the output from <literal>SHOW
-          PROCESSLIST</literal>:
+          Some <literal>State</literal> values commonly seen in the
+          output from <literal>SHOW PROCESSLIST</literal>:
         </para>
 
         <itemizedlist>
@@ -15939,8 +15890,7 @@
             </para>
 
             <para>
-              The thread is performing (automatic) checking of the
-              table.
+              The thread is performing a table check operation.
             </para>
           </listitem>
 
@@ -15963,7 +15913,7 @@
             </para>
 
             <para>
-              Slave connecting to master.
+              A replication slave is connecting to its master.
             </para>
           </listitem>
 
@@ -16219,6 +16169,15 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <literal>System lock</literal>
             </para>
 
@@ -16248,7 +16207,7 @@
             </para>
 
             <para>
-              The thread is searching for rows to update and updating
+              The thread is searching for rows to update and is updating
               them.
             </para>
           </listitem>
@@ -16438,9 +16397,9 @@
         </para>
 
         <para>
-          Note that some status variables have only a global value. For
-          these you get the same value for both
-          <literal>GLOBAL</literal> and <literal>SESSION</literal>.
+          Some status variables have only a global value. For these you
+          get the same value for both <literal>GLOBAL</literal> and
+          <literal>SESSION</literal>.
         </para>
 
       </section>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-27 04:02:22 UTC (rev 1056)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-27 04:06:17 UTC (rev 1057)
@@ -11635,6 +11635,13 @@
           account, <literal>CREATE USER</literal> creates a new row in
           the <literal>mysql.user</literal> table that has no
           privileges. An error occurs if the account already exists.
+          Each account is named using the same format as for the
+          <literal>GRANT</literal> statement; for example,
+          <literal>'jeffrey'@'localhost'</literal>. The user and host
+          parts of the account name correspond to the
+          <literal>User</literal> and <literal>Host</literal> column
+          values of the <literal>user</literal> table row for the
+          account.
         </para>
 
         <para>
@@ -11717,10 +11724,9 @@
           <literal>CREATE USER</literal> privilege or the
           <literal>DELETE</literal> privilege for the
           <literal>mysql</literal> database. Each account is named using
-          the same format as for <literal>GRANT</literal> or
-          <literal>REVOKE</literal>; for example,
-          <literal>'jeffrey'@'localhost'</literal>. The user and host
-          parts of the account name correspond to the
+          the same format as for the <literal>GRANT</literal> statement;
+          for example, <literal>'jeffrey'@'localhost'</literal>. The
+          user and host parts of the account name correspond to the
           <literal>User</literal> and <literal>Host</literal> column
           values of the <literal>user</literal> table row for the
           account.
@@ -12882,10 +12888,14 @@
           <literal>CREATE USER</literal> privilege or the
           <literal>UPDATE</literal> privilege for the
           <literal>mysql</literal> database. An error occurs if any old
-          account does not exist or any new account exists. The
-          <replaceable>old_user</replaceable> and
-          <replaceable>new_user</replaceable> values are given the same
-          way as for the <literal>GRANT</literal> statement.
+          account does not exist or any new account exists. Each account
+          is named using the same format as for the
+          <literal>GRANT</literal> statement; for example,
+          <literal>'jeffrey'@'localhost'</literal>. The user and host
+          parts of the account name correspond to the
+          <literal>User</literal> and <literal>Host</literal> column
+          values of the <literal>user</literal> table row for the
+          account.
         </para>
 
         <remark role="help-description-end"/>
@@ -15361,10 +15371,6 @@
           STATUS</literal>.
         </para>
 
-        <para>
-          <literal>SHOW ENGINE</literal> can be used as of MySQL 4.1.2.
-        </para>
-
       </section>
 
       <section id="show-engines">
@@ -15388,11 +15394,11 @@
 </programlisting>
 
         <para>
-          <literal>SHOW ENGINES</literal> shows you status information
-          about the storage engines. This is particularly useful for
-          checking whether a storage engine is supported, or to see what
-          the default engine is. <literal>SHOW TABLE TYPES</literal> is
-          a deprecated synonym.
+          <literal>SHOW ENGINES</literal> displays status information
+          about the server's storage engines. This is particularly
+          useful for checking whether a storage engine is supported, or
+          to see what the default engine is. <literal>SHOW TABLE
+          TYPES</literal> is a deprecated synonym.
         </para>
 
         <remark>
@@ -15474,7 +15480,7 @@
 </programlisting>
 
         <para>
-          A <literal>Support</literal> value indicates whether the
+          The <literal>Support</literal> value indicates whether the
           particular storage engine is supported, and which is the
           default engine. For example, if the server is started with the
           <option>--default-table-type=InnoDB</option> option, the
@@ -15487,7 +15493,8 @@
         <para>
           The <literal>Transactions</literal>, <literal>XA</literal>,
           and <literal>Savepoints</literal> columns were added in MySQL
-          5.1.2.
+          5.1.2. They indicate whether the storage engine supports
+          transactions, XA transactions, and savepoints, respectively.
         </para>
 
       </section>
@@ -15566,9 +15573,16 @@
         <remark role="help-description-begin"/>
 
         <para>
-          This statement lists the <literal>GRANT</literal> statements
-          that must be issued to duplicate the privileges that are
-          granted to a MySQL user account.
+          This statement lists the <literal>GRANT</literal> statement or
+          statements that must be issued to duplicate the privileges
+          that are granted to a MySQL user account. The account is named
+          using the same format as for the <literal>GRANT</literal>
+          statement; for example,
+          <literal>'jeffrey'@'localhost'</literal>. The user and host
+          parts of the account name correspond to the
+          <literal>User</literal> and <literal>Host</literal> column
+          values of the <literal>user</literal> table row for the
+          account.
         </para>
 
 <programlisting>
@@ -15628,8 +15642,8 @@
 </programlisting>
 
         <para>
-          <literal>SHOW INDEX</literal> returns table index information
-          in a format that resembles the
+          <literal>SHOW INDEX</literal> returns table index information.
+          The format resembles that of the
           <literal>SQLStatistics</literal> call in ODBC.
         </para>
 
@@ -15737,7 +15751,7 @@
 
             <para>
               The number of indexed characters if the column is only
-              partly indexed. <literal>NULL</literal> if the entire
+              partly indexed, <literal>NULL</literal> if the entire
               column is indexed.
             </para>
           </listitem>
@@ -15799,8 +15813,8 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SHOW INDEX FROM mytable FROM mydb;</userinput>
-mysql&gt; <userinput>SHOW INDEX FROM mydb.mytable;</userinput>
+SHOW INDEX FROM mytable FROM mydb;
+SHOW INDEX FROM mydb.mytable;
 </programlisting>
 
         <para>
@@ -15913,7 +15927,7 @@
             </para>
 
             <para>
-              Whether table name is locked. Name-locking is used for
+              Whether the table name is locked. Name locking is used for
               operations such as dropping or renaming tables.
             </para>
           </listitem>
@@ -15987,8 +16001,8 @@
 
         <para>
           <literal>SHOW PRIVILEGES</literal> shows the list of system
-          privileges that the MySQL server supports. The exact output
-          depends on the version of your server.
+          privileges that the MySQL server supports. The exact list of
+          privileges depends on the version of your server.
         </para>
 
         <remark>
@@ -16017,94 +16031,7 @@
 Privilege: Create temporary tables
 Context: Databases
 Comment: To use CREATE TEMPORARY TABLE
-*************************** 6. row ***************************
-Privilege: Create view
-Context: Tables
-Comment: To create new views
-*************************** 7. row ***************************
-Privilege: Create user
-Context: Server Admin
-Comment: To create new users
-*************************** 8. row ***************************
-Privilege: Delete
-Context: Tables
-Comment: To delete existing rows
-*************************** 9. row ***************************
-Privilege: Drop
-Context: Databases,Tables
-Comment: To drop databases, tables, and views
-*************************** 10. row ***************************
-Privilege: Execute
-Context: Functions,Procedures
-Comment: To execute stored routines
-*************************** 11. row ***************************
-Privilege: File
-Context: File access on server
-Comment: To read and write files on the server
-*************************** 12. row ***************************
-Privilege: Grant option
-Context: Databases,Tables,Functions,Procedures
-Comment: To give to other users those privileges you possess
-*************************** 13. row ***************************
-Privilege: Index
-Context: Tables
-Comment: To create or drop indexes
-*************************** 14. row ***************************
-Privilege: Insert
-Context: Tables
-Comment: To insert data into tables
-*************************** 15. row ***************************
-Privilege: Lock tables
-Context: Databases
-Comment: To use LOCK TABLES (together with SELECT privilege)
-*************************** 16. row ***************************
-Privilege: Process
-Context: Server Admin
-Comment: To view the plain text of currently executing queries
-*************************** 17. row ***************************
-Privilege: References
-Context: Databases,Tables
-Comment: To have references on tables
-*************************** 18. row ***************************
-Privilege: Reload
-Context: Server Admin
-Comment: To reload or refresh tables, logs and privileges
-*************************** 19. row ***************************
-Privilege: Replication client
-Context: Server Admin
-Comment: To ask where the slave or master servers are
-*************************** 20. row ***************************
-Privilege: Replication slave
-Context: Server Admin
-Comment: To read binary log events from the master
-*************************** 21. row ***************************
-Privilege: Select
-Context: Tables
-Comment: To retrieve rows from table
-*************************** 22. row ***************************
-Privilege: Show databases
-Context: Server Admin
-Comment: To see all databases with SHOW DATABASES
-*************************** 23. row ***************************
-Privilege: Show view
-Context: Tables
-Comment: To see views with SHOW CREATE VIEW
-*************************** 24. row ***************************
-Privilege: Shutdown
-Context: Server Admin
-Comment: To shut down the server
-*************************** 25. row ***************************
-Privilege: Super
-Context: Server Admin
-Comment: To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
-*************************** 26. row ***************************
-Privilege: Update
-Context: Tables
-Comment: To update existing rows
-*************************** 27. row ***************************
-Privilege: Usage
-Context: Server Admin
-Comment: No privileges - allow connect only
+...
 </programlisting>
 
       </section>
@@ -16162,7 +16089,8 @@
           is, threads associated with the MySQL account that you are
           using). See <xref linkend="kill"/>. If you do not use the
           <literal>FULL</literal> keyword, only the first 100 characters
-          of each query are shown.
+          of each statement are shown in the <literal>Info</literal>
+          field.
         </para>
 
         <remark role="help-description-end"/>
@@ -16180,6 +16108,7 @@
         <para>
           The output of <literal>SHOW PROCESSLIST</literal> may look
           like this:
+        </para>
 
 <programlisting>
 mysql> SHOW FULL PROCESSLIST\G
@@ -16231,240 +16160,263 @@
 5 rows in set (0.00 sec)
 </programlisting>
 
+        <para>
           The columns have the following meaning:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                <literal>Id</literal>: The connection identifier
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>Id</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>User</literal>: The MySQL user who is issuing
-                the statement
-              </para>
+            <para>
+              The connection identifier
+            </para>
+          </listitem>
 
-              <para>
-                If the user is <literal>system user</literal>, it can be
-                either of these:
+          <listitem>
+            <para>
+              <literal>User</literal>
+            </para>
 
-                <itemizedlist>
+            <para>
+              The MySQL user who is issuing the statement
+            </para>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
-                    </para>
-                  </listitem>
+            <para>
+              If the user is <literal>system user</literal>, it can be
+              any of these:
+            </para>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_SLAVE_IO</literal>
-                    </para>
-                  </listitem>
+            <itemizedlist>
 
-                  <listitem>
-                    <para>
-                      <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
-                    </para>
-                  </listitem>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
+                </para>
+              </listitem>
 
-                </itemizedlist>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_SLAVE_IO</literal>
+                </para>
+              </listitem>
 
-                For the <literal>system user</literal>, there's no host
-                specified in the <literal>Host</literal> column.
-              </para>
-            </listitem>
+              <listitem>
+                <para>
+                  <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
+                </para>
+              </listitem>
 
-            <listitem>
-              <para>
-                <literal>Host</literal>: The host of the client issuing
-                the statement (except for <literal>system user</literal>
-                where there is no host)
-              </para>
+            </itemizedlist>
 
-              <para>
-                <literal>SHOW PROCESSLIST</literal> reports the hostname
-                for TCP/IP connections in
-                <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
-                format to make it easier to determine which client is
-                doing what.
-              </para>
-            </listitem>
+            <para>
+              For the <literal>system user</literal>, there's no host
+              specified in the <literal>Host</literal> column.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <literal>db</literal>: The default database, if
-                selected, otherwise <literal>NULL</literal>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>Host</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>Command</literal>: The value of that column
-                corresponds to the
-                <literal>COM_<replaceable>xxx</replaceable></literal>
-                commands of the client/server protocol; see
-                <xref linkend="server-status-variables"/>
-              </para>
+            <para>
+              The hostname of the client issuing the statement (except
+              for <literal>system user</literal> where there is no host)
+            </para>
 
-              <para>
-                The <literal>Command</literal> value may be one of the
-                following: <literal>Binlog Dump</literal>,
-                <literal>Change user</literal>, <literal>Close
-                stmt</literal>, <literal>Connect</literal>,
-                <literal>Connect Out</literal>, <literal>Create
-                DB</literal>, <literal>Debug</literal>, <literal>Delayed
-                insert</literal>, <literal>Drop DB</literal>,
-                <literal>Error</literal>, <literal>Execute</literal>,
-                <literal>Fetch</literal>, <literal>Field List</literal>,
-                <literal>Init DB</literal>, <literal>Kill</literal>,
-                <literal>Long Data</literal>, <literal>Ping</literal>,
-                <literal>Prepare</literal>,
-                <literal>Processlist</literal>,
-                <literal>Query</literal>, <literal>Quit</literal>,
-                <literal>Refresh</literal>, <literal>Register
-                Slave</literal>, <literal>Reset stmt</literal>,
-                <literal>Set option</literal>,
-                <literal>Shutdown</literal>, <literal>Sleep</literal>,
-                <literal>Statistics</literal>, <literal>Table
-                Dump</literal>, <literal>Time</literal>
-              </para>
-            </listitem>
+            <para>
+              <literal>SHOW PROCESSLIST</literal> reports the hostname
+              for TCP/IP connections in
+              <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
+              format to make it easier to determine which client is
+              doing what.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                <literal>Time</literal>: The time in seconds between the
-                start of the statement or command and now
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              <literal>db</literal>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>State</literal>: An action, event, or state
-                which can be one of the following: <literal>After
-                create</literal>, <literal>Analyzing</literal>,
-                <literal>Changing master</literal>, <literal>Checking
-                master version</literal>, <literal>Checking
-                table</literal>, <literal>Connecting to
-                master</literal>, <literal>Copying to group
-                table</literal>, <literal>Copying to tmp
-                table</literal>, <literal>Creating delayed
-                handler</literal>, <literal>Creating index</literal>,
-                <literal>Creating sort index</literal>,
-                <literal>Creating table from master dump</literal>,
-                <literal>Creating tmp table</literal>,
-                <literal>Execution of init_command</literal>,
-                <literal>FULLTEXT initialization</literal>,
-                <literal>Finished reading one binlog; switching to next
-                binlog</literal>, <literal>Flushing tables</literal>,
-                <literal>Killed</literal>, <literal>Killing
-                slave</literal>, <literal>Locked</literal>,
-                <literal>Making temp file </literal>, <literal>Opening
-                master dump table</literal>, <literal>Opening
-                table</literal>, <literal>Opening tables</literal>,
-                <literal>Processing request</literal>, <literal>Purging
-                old relay logs</literal>, <literal>Queueing master event
-                to the relay log</literal>, <literal>Reading event from
-                the relay log</literal>, <literal>Reading from
-                net</literal>, <literal>Reading master dump table
-                data</literal>, <literal>Rebuilding the index on master
-                dump table</literal>, <literal>Reconnecting after a
-                failed binlog dump request</literal>,
-                <literal>Reconnecting after a failed master event
-                read</literal>, <literal>Registering slave on
-                master</literal>, <literal>Removing
-                duplicates</literal>, <literal>Reopen tables</literal>,
-                <literal>Repair by sorting</literal>, <literal>Repair
-                done</literal>, <literal>Repair with keycache</literal>,
-                <literal>Requesting binlog dump</literal>,
-                <literal>Rolling back</literal>, <literal>Saving
-                state</literal>, <literal>Searching rows for
-                update</literal>, <literal>Sending binlog event to
-                slave</literal>, <literal>Sending data</literal>,
-                <literal>Sorting for group</literal>, <literal>Sorting
-                for order</literal>, <literal>Sorting index</literal>,
-                <literal>Sorting result</literal>, <literal>System
-                lock</literal>, <literal>Table lock</literal>,
-                <literal>Thread initialized</literal>,
-                <literal>Updating</literal>, <literal>User
-                lock</literal>, <literal>Waiting for INSERT</literal>,
-                <literal>Waiting for master to send event</literal>,
-                <literal>Waiting for master update</literal>,
-                <literal>Waiting for slave mutex on exit</literal>,
-                <literal>Waiting for table</literal>, <literal>Waiting
-                for tables</literal>, <literal>Waiting for the next
-                event in relay log</literal>, <literal>Waiting on
-                cond</literal>, <literal>Waiting to finalize
-                termination</literal>, <literal>Waiting to reconnect
-                after a failed binlog dump request</literal>,
-                <literal>Waiting to reconnect after a failed master
-                event read</literal>, <literal>Writing to net</literal>,
-                <literal>allocating local table</literal>,
-                <literal>cleaning up</literal>, <literal>closing
-                tables</literal>, <literal>converting HEAP to
-                MyISAM</literal>, <literal>copy to tmp table</literal>,
-                <literal>creating table</literal>, <literal>deleting
-                from main table</literal>, <literal>deleting from
-                reference tables</literal>,
-                <literal>discard_or_import_tablespace</literal>,
-                <literal>end</literal>, <literal>freeing
-                items</literal>, <literal>got handler lock</literal>,
-                <literal>got old table</literal>,
-                <literal>info</literal>, <literal>init</literal>,
-                <literal>insert</literal>, <literal>logging slow
-                query</literal>, <literal>login</literal>,
-                <literal>preparing</literal>, <literal>purging old relay
-                logs</literal>, <literal>query end</literal>,
-                <literal>removing tmp table</literal>,
-                <literal>rename</literal>, <literal>rename result
-                table</literal>, <literal>reschedule</literal>,
-                <literal>setup</literal>, <literal>starting
-                slave</literal>, <literal>statistics</literal>,
-                <literal>storing row into queue</literal>,
-                <literal>update</literal>, <literal>updating</literal>,
-                <literal>updating main table</literal>,
-                <literal>updating reference tables</literal>,
-                <literal>upgrading lock</literal>, <literal>waiting for
-                delay_list</literal>, <literal>waiting for handler
-                insert</literal>, <literal>waiting for handler
-                lock</literal>, <literal>waiting for handler
-                open</literal>
-              </para>
+            <para>
+              The default database, if one is selected, otherwise
+              <literal>NULL</literal>
+            </para>
+          </listitem>
 
-              <para>
-                The most common <literal>State</literal> values are
-                described in the rest of this section. Most of the other
-                <literal>State</literal> values are useful only for
-                finding bugs in the server.
-              </para>
+          <listitem>
+            <para>
+              <literal>Command</literal>
+            </para>
 
-              <para>
-                For the <literal>SHOW PROCESSLIST</literal> statement,
-                the value of <literal>State</literal> is
-                <literal>NULL</literal>.
-              </para>
-            </listitem>
+            <para>
+              The value of that column corresponds to the
+              <literal>COM_<replaceable>xxx</replaceable></literal>
+              commands of the client/server protocol; see
+              <xref linkend="server-status-variables"/>
+            </para>
 
-            <listitem>
-              <para>
-                <literal>Info</literal>: The query that the thread was
-                issuing, but only if that query was still running by the
-                time <literal>SHOW PROCESSLIST</literal> was issued
-                (this is always the case for the <literal>SHOW
-                PROCESSLIST</literal> statement itself, and for
-                long-running queries)
-              </para>
-            </listitem>
+            <para>
+              The <literal>Command</literal> value may be one of the
+              following: <literal>Binlog Dump</literal>, <literal>Change
+              user</literal>, <literal>Close stmt</literal>,
+              <literal>Connect</literal>, <literal>Connect
+              Out</literal>, <literal>Create DB</literal>,
+              <literal>Debug</literal>, <literal>Delayed
+              insert</literal>, <literal>Drop DB</literal>,
+              <literal>Error</literal>, <literal>Execute</literal>,
+              <literal>Fetch</literal>, <literal>Field List</literal>,
+              <literal>Init DB</literal>, <literal>Kill</literal>,
+              <literal>Long Data</literal>, <literal>Ping</literal>,
+              <literal>Prepare</literal>,
+              <literal>Processlist</literal>, <literal>Query</literal>,
+              <literal>Quit</literal>, <literal>Refresh</literal>,
+              <literal>Register Slave</literal>, <literal>Reset
+              stmt</literal>, <literal>Set option</literal>,
+              <literal>Shutdown</literal>, <literal>Sleep</literal>,
+              <literal>Statistics</literal>, <literal>Table
+              Dump</literal>, <literal>Time</literal>
+            </para>
+          </listitem>
 
-          </itemizedlist>
-        </para>
+          <listitem>
+            <para>
+              <literal>Time</literal>
+            </para>
 
+            <para>
+              The time in seconds between the start of the statement or
+              command and now
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>State</literal>
+            </para>
+
+            <para>
+              An action, event, or state which can be one of the
+              following: <literal>After create</literal>,
+              <literal>Analyzing</literal>, <literal>Changing
+              master</literal>, <literal>Checking master
+              version</literal>, <literal>Checking table</literal>,
+              <literal>Connecting to master</literal>, <literal>Copying
+              to group table</literal>, <literal>Copying to tmp
+              table</literal>, <literal>Creating delayed
+              handler</literal>, <literal>Creating index</literal>,
+              <literal>Creating sort index</literal>, <literal>Creating
+              table from master dump</literal>, <literal>Creating tmp
+              table</literal>, <literal>Execution of
+              init_command</literal>, <literal>FULLTEXT
+              initialization</literal>, <literal>Finished reading one
+              binlog; switching to next binlog</literal>,
+              <literal>Flushing tables</literal>,
+              <literal>Killed</literal>, <literal>Killing
+              slave</literal>, <literal>Locked</literal>,
+              <literal>Making temp file </literal>, <literal>Opening
+              master dump table</literal>, <literal>Opening
+              table</literal>, <literal>Opening tables</literal>,
+              <literal>Processing request</literal>, <literal>Purging
+              old relay logs</literal>, <literal>Queueing master event
+              to the relay log</literal>, <literal>Reading event from
+              the relay log</literal>, <literal>Reading from
+              net</literal>, <literal>Reading master dump table
+              data</literal>, <literal>Rebuilding the index on master
+              dump table</literal>, <literal>Reconnecting after a failed
+              binlog dump request</literal>, <literal>Reconnecting after
+              a failed master event read</literal>, <literal>Registering
+              slave on master</literal>, <literal>Removing
+              duplicates</literal>, <literal>Reopen tables</literal>,
+              <literal>Repair by sorting</literal>, <literal>Repair
+              done</literal>, <literal>Repair with keycache</literal>,
+              <literal>Requesting binlog dump</literal>,
+              <literal>Rolling back</literal>, <literal>Saving
+              state</literal>, <literal>Searching rows for
+              update</literal>, <literal>Sending binlog event to
+              slave</literal>, <literal>Sending data</literal>,
+              <literal>Sorting for group</literal>, <literal>Sorting for
+              order</literal>, <literal>Sorting index</literal>,
+              <literal>Sorting result</literal>, <literal>System
+              lock</literal>, <literal>Table lock</literal>,
+              <literal>Thread initialized</literal>,
+              <literal>Updating</literal>, <literal>User lock</literal>,
+              <literal>Waiting for INSERT</literal>, <literal>Waiting
+              for master to send event</literal>, <literal>Waiting for
+              master update</literal>, <literal>Waiting for slave mutex
+              on exit</literal>, <literal>Waiting for table</literal>,
+              <literal>Waiting for tables</literal>, <literal>Waiting
+              for the next event in relay log</literal>,
+              <literal>Waiting on cond</literal>, <literal>Waiting to
+              finalize termination</literal>, <literal>Waiting to
+              reconnect after a failed binlog dump request</literal>,
+              <literal>Waiting to reconnect after a failed master event
+              read</literal>, <literal>Writing to net</literal>,
+              <literal>allocating local table</literal>,
+              <literal>cleaning up</literal>, <literal>closing
+              tables</literal>, <literal>converting HEAP to
+              MyISAM</literal>, <literal>copy to tmp table</literal>,
+              <literal>creating table</literal>, <literal>deleting from
+              main table</literal>, <literal>deleting from reference
+              tables</literal>,
+              <literal>discard_or_import_tablespace</literal>,
+              <literal>end</literal>, <literal>freeing items</literal>,
+              <literal>got handler lock</literal>, <literal>got old
+              table</literal>, <literal>info</literal>,
+              <literal>init</literal>, <literal>insert</literal>,
+              <literal>logging slow query</literal>,
+              <literal>login</literal>, <literal>preparing</literal>,
+              <literal>purging old relay logs</literal>, <literal>query
+              end</literal>, <literal>removing tmp table</literal>,
+              <literal>rename</literal>, <literal>rename result
+              table</literal>, <literal>reschedule</literal>,
+              <literal>setup</literal>, <literal>starting
+              slave</literal>, <literal>statistics</literal>,
+              <literal>storing row into queue</literal>,
+              <literal>update</literal>, <literal>updating</literal>,
+              <literal>updating main table</literal>, <literal>updating
+              reference tables</literal>, <literal>upgrading
+              lock</literal>, <literal>waiting for delay_list</literal>,
+              <literal>waiting for handler insert</literal>,
+              <literal>waiting for handler lock</literal>,
+              <literal>waiting for handler open</literal>
+            </para>
+
+            <para>
+              The most common <literal>State</literal> values are
+              described in the rest of this section. Most of the other
+              <literal>State</literal> values are useful only for
+              finding bugs in the server.
+            </para>
+
+            <para>
+              For the <literal>SHOW PROCESSLIST</literal> statement, the
+              value of <literal>State</literal> is
+              <literal>NULL</literal>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <literal>Info</literal>
+            </para>
+
+            <para>
+              The statement that the thread is executing, or
+              <literal>NULL</literal> if it is not executing any
+              statement.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
         <para>
-          Some states commonly seen in the output from <literal>SHOW
-          PROCESSLIST</literal>:
+          Some <literal>State</literal> values commonly seen in the
+          output from <literal>SHOW PROCESSLIST</literal>:
         </para>
 
         <itemizedlist>
@@ -16475,8 +16427,7 @@
             </para>
 
             <para>
-              The thread is performing (automatic) checking of the
-              table.
+              The thread is performing a table check operation.
             </para>
           </listitem>
 
@@ -16499,7 +16450,7 @@
             </para>
 
             <para>
-              Slave connecting to master.
+              A replication slave is connecting to its master.
             </para>
           </listitem>
 
@@ -16755,6 +16706,15 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <literal>System lock</literal>
             </para>
 
@@ -16784,7 +16744,7 @@
             </para>
 
             <para>
-              The thread is searching for rows to update and updating
+              The thread is searching for rows to update and is updating
               them.
             </para>
           </listitem>
@@ -16972,9 +16932,9 @@
         </para>
 
         <para>
-          Note that some status variables have only a global value. For
-          these you get the same value for both
-          <literal>GLOBAL</literal> and <literal>SESSION</literal>.
+          Some status variables have only a global value. For these you
+          get the same value for both <literal>GLOBAL</literal> and
+          <literal>SESSION</literal>.
         </para>
 
       </section>

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