List:Commits« Previous MessageNext Message »
From:paul Date:January 28 2006 11:41pm
Subject:svn commit - mysqldoc@docsrva: r1087 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-29 00:41:44 +0100 (Sun, 29 Jan 2006)
New Revision: 1087

Log:
 r6826@frost:  paul | 2006-01-28 15:50:53 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml


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

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-28 20:55:43 UTC (rev 1086)
+++ trunk/refman-4.1/database-administration.xml	2006-01-28 23:41:44 UTC (rev 1087)
@@ -10638,7 +10638,8 @@
       </para>
 
       <para>
-        MySQL access control involves two stages:
+        MySQL access control involves two stages when you run a client
+        program that connects to the server:
       </para>
 
       <itemizedlist>
@@ -10667,8 +10668,8 @@
       <para>
         If your privileges are changed (either by yourself or someone
         else) while you are connected, those changes do not necessarily
-        take effect immediately for the next statement you issue. See
-        <xref linkend="privilege-changes"/>, for details.
+        take effect immediately for the next statement that you issue.
+        See <xref linkend="privilege-changes"/>, for details.
       </para>
 
       <para>
@@ -10683,13 +10684,12 @@
 
       <para>
         Normally, you manipulate the contents of the grant tables
-        indirectly by using the <literal>GRANT</literal> and
-        <literal>REVOKE</literal> statements to set up accounts and
-        control the privileges available to each one. See
-        <xref linkend="grant"/>, and
-        <xref linkend="revoke"/>. The discussion here describes the
-        underlying structure of the grant tables and how the server uses
-        their contents when interacting with clients.
+        indirectly by using statements such as <literal>GRANT</literal>
+        and <literal>REVOKE</literal> to set up accounts and control the
+        privileges available to each one. See
+        <xref linkend="account-management-sql"/>. The discussion here
+        describes the underlying structure of the grant tables and how
+        the server uses their contents when interacting with clients.
       </para>
 
       <para>
@@ -11016,7 +11016,7 @@
 
         <listitem>
           <para>
-            Scope columns determine the scope of each entry (row) in the
+            Scope columns determine the scope of each row (entry) in the
             tables; that is, the context in which the row applies. For
             example, a <literal>user</literal> table row with
             <literal>Host</literal> and <literal>User</literal> values
@@ -11037,7 +11037,7 @@
             <literal>columns_priv</literal> tables contain scope columns
             indicating tables or table/column combinations to which each
             row applies. The <literal>procs_priv</literal> scope columns
-            indicate the store routine to which each row applies.
+            indicate the stored routine to which each row applies.
           </para>
         </listitem>
 
@@ -11139,8 +11139,8 @@
 
       <informaltable>
         <tgroup cols="3">
+          <colspec colwidth="20*"/>
           <colspec colwidth="15*"/>
-          <colspec colwidth="15*"/>
           <colspec colwidth="55*"/>
           <tbody>
             <row>
@@ -11169,7 +11169,8 @@
       </informaltable>
 
       <para>
-        Briefly, the server uses the grant tables as follows:
+        Briefly, the server uses the grant tables in the following
+        manner:
       </para>
 
       <itemizedlist>
@@ -11218,10 +11219,13 @@
 
           <para>
             <emphasis role="bold">Note</emphasis>: The
-            <literal>host</literal> table is not affected by the
-            <literal>GRANT</literal> and <literal>REVOKE</literal>
-            statements. Most MySQL installations need not use this table
-            at all.
+            <literal>host</literal> table must be modified directly with
+            statements such as <literal>INSERT</literal>,
+            <literal>UPDATE</literal>, and <literal>DELETE</literal>. It
+            is not affected by statements such as
+            <literal>GRANT</literal> and <literal>REVOKE</literal> that
+            modify the grant tables indirectly. Most MySQL installations
+            need not use this table at all.
           </para>
         </listitem>
 
@@ -11274,8 +11278,9 @@
         When you modify the contents of the grant tables, it is a good
         idea to make sure that your changes set up privileges the way
         you want. To check the privileges for a given account, use the
-        <literal>SHOW GRANTS</literal> statement. For example, to
-        determine the privileges that are granted to an account with
+        <literal>SHOW GRANTS</literal> statement. (See
+        <xref linkend="show-grants"/>.) For example, to determine the
+        privileges that are granted to an account with
         <literal>Host</literal> and <literal>User</literal> values of
         <literal>pc84.example.com</literal> and <literal>bob</literal>,
         issue this statement:
@@ -11286,19 +11291,6 @@
 </programlisting>
 
       <para>
-        A useful diagnostic tool is the <command>mysqlaccess</command>
-        script, which Yves Carlier has provided for the MySQL
-        distribution. Invoke <command>mysqlaccess</command> with the
-        <option>--help</option> option to find out how it works. Note
-        that <command>mysqlaccess</command> checks access using only the
-        <literal>user</literal>, <literal>db</literal>, and
-        <literal>host</literal> tables. It does not check table, column,
-        or routine privileges specified in the
-        <literal>tables_priv</literal>, <literal>columns_priv</literal>,
-        or <literal>procs_priv</literal> tables.
-      </para>
-
-      <para>
         For additional help in diagnosing privilege-related problems,
         see <xref linkend="access-denied"/>. For general advice on
         security issues, see <xref linkend="security"/>.
@@ -11343,9 +11335,9 @@
 
       <informaltable>
         <tgroup cols="3">
+          <colspec colwidth="30*"/>
           <colspec colwidth="33*"/>
-          <colspec colwidth="33*"/>
-          <colspec colwidth="34*"/>
+          <colspec colwidth="37*"/>
           <tbody>
             <row>
               <entry><emphasis role="bold">Privilege</emphasis></entry>
@@ -11507,8 +11499,8 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>SELECT 1+1;</userinput>
-mysql&gt; <userinput>SELECT PI()*2;</userinput>
+SELECT 1+1;
+SELECT PI()*2;
 </programlisting>
 
       <para>
@@ -11542,7 +11534,8 @@
         database directory, because the server can access any of those
         files.) The <literal>FILE</literal> privilege also enables the
         user to create new files in any directory where the MySQL server
-        has write access. Existing files cannot be overwritten.
+        has write access. As a security measure, the server will not
+        overwrite existing files.
       </para>
 
       <para>
@@ -11605,22 +11598,19 @@
 
       <para>
         The <literal>shutdown</literal> command shuts down the server.
-        This command can be issued only from
-        <command>mysqladmin</command>. There is no corresponding SQL
-        statement.
+        There is no corresponding SQL statement.
       </para>
 
       <para>
         The <literal>processlist</literal> command displays information
-        about the threads executing within the server (that is, about
-        the statements being executed by clients associated with other
-        accounts). The <literal>kill</literal> command terminates server
-        threads. You can always display or kill your own threads, but
-        you need the <literal>PROCESS</literal> privilege to display
-        threads initiated by other users and the
-        <literal>SUPER</literal> privilege to kill them. See
-        <xref linkend="kill"/>. Prior to MySQL 4.0.2 when
-        <literal>SUPER</literal> was introduced, the
+        about the threads executing within the server (that is,
+        information about the statements being executed by clients). The
+        <literal>kill</literal> command terminates server threads. You
+        can always display or kill your own threads, but you need the
+        <literal>PROCESS</literal> privilege to display threads
+        initiated by other users and the <literal>SUPER</literal>
+        privilege to kill them. See <xref linkend="kill"/>. Prior to
+        MySQL 4.0.2 when <literal>SUPER</literal> was introduced, the
         <literal>PROCESS</literal> privilege controls the ability to
         both see and terminate threads for other clients.
       </para>
@@ -11660,14 +11650,14 @@
         privilege see only databases for which they have some
         privileges, and cannot use the statement at all if the server
         was started with the <option>--skip-show-database</option>
-        option. Note that any global privilege is a privilege for the
-        database.
+        option. Note that <emphasis>any</emphasis> global privilege is a
+        privilege for the database.
       </para>
 
       <para>
-        It is a good idea in general to grant to an account only those
-        privileges that it needs. You should exercise particular caution
-        in granting the <literal>FILE</literal> and administrative
+        It is a good idea to grant to an account only those privileges
+        that it needs. You should exercise particular caution in
+        granting the <literal>FILE</literal> and administrative
         privileges:
       </para>
 
@@ -11797,7 +11787,7 @@
       </indexterm>
 
       <para>
-        MySQL client programs generally expect you to specify these
+        MySQL client programs generally expect you to specify certain
         connection parameters when you want to access a MySQL server:
       </para>
 
@@ -11878,7 +11868,8 @@
 
         <listitem>
           <para>
-            No password is supplied if <option>-p</option> is missing.
+            No password is supplied if neither <option>-p</option> nor
+            <option>--password</option>is given.
           </para>
         </listitem>
 
@@ -11929,8 +11920,8 @@
 </programlisting>
 
           <para>
-            Option files are discussed further in
-            <xref linkend="option-files"/>.
+            <xref linkend="option-files"/>, discusses option files
+            further.
           </para>
 
           <indexterm type="type">

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-28 20:55:43 UTC (rev 1086)
+++ trunk/refman-5.0/database-administration.xml	2006-01-28 23:41:44 UTC (rev 1087)
@@ -12642,7 +12642,8 @@
       </para>
 
       <para>
-        MySQL access control involves two stages:
+        MySQL access control involves two stages when you run a client
+        program that connects to the server:
       </para>
 
       <itemizedlist>
@@ -12671,8 +12672,8 @@
       <para>
         If your privileges are changed (either by yourself or someone
         else) while you are connected, those changes do not necessarily
-        take effect immediately for the next statement you issue. See
-        <xref linkend="privilege-changes"/>, for details.
+        take effect immediately for the next statement that you issue.
+        See <xref linkend="privilege-changes"/>, for details.
       </para>
 
       <para>
@@ -12687,13 +12688,12 @@
 
       <para>
         Normally, you manipulate the contents of the grant tables
-        indirectly by using the <literal>GRANT</literal> and
-        <literal>REVOKE</literal> statements to set up accounts and
-        control the privileges available to each one. See
-        <xref linkend="grant"/>, and
-        <xref linkend="revoke"/>. The discussion here describes the
-        underlying structure of the grant tables and how the server uses
-        their contents when interacting with clients.
+        indirectly by using statements such as <literal>GRANT</literal>
+        and <literal>REVOKE</literal> to set up accounts and control the
+        privileges available to each one. See
+        <xref linkend="account-management-sql"/>. The discussion here
+        describes the underlying structure of the grant tables and how
+        the server uses their contents when interacting with clients.
       </para>
 
       <para>
@@ -13030,8 +13030,7 @@
 
       <para>
         The <literal>Timestamp</literal> and <literal>Grantor</literal>
-        columns currently are unused and are not discussed any further
-        here.
+        columns currently are unused and are discussed no further here.
       </para>
 
       <para>
@@ -13108,7 +13107,7 @@
 
         <listitem>
           <para>
-            Scope columns determine the scope of each entry (row) in the
+            Scope columns determine the scope of each row (entry) in the
             tables; that is, the context in which the row applies. For
             example, a <literal>user</literal> table row with
             <literal>Host</literal> and <literal>User</literal> values
@@ -13129,7 +13128,7 @@
             <literal>columns_priv</literal> tables contain scope columns
             indicating tables or table/column combinations to which each
             row applies. The <literal>procs_priv</literal> scope columns
-            indicate the store routine to which each row applies.
+            indicate the stored routine to which each row applies.
           </para>
         </listitem>
 
@@ -13202,8 +13201,8 @@
         <literal>Host</literal> values are case-insensitive.
         <literal>User</literal>, <literal>Password</literal>,
         <literal>Db</literal>, and <literal>Table_name</literal> values
-        are case sensitive. <literal>Column_name</literal> values are
-        case insensitive.
+        are case sensitive. <literal>Column_name</literal> and
+        <literal>Routine_name</literal> values are case insensitive.
       </para>
 
       <para>
@@ -13225,8 +13224,8 @@
 
       <informaltable>
         <tgroup cols="3">
+          <colspec colwidth="20*"/>
           <colspec colwidth="15*"/>
-          <colspec colwidth="15*"/>
           <colspec colwidth="55*"/>
           <tbody>
             <row>
@@ -13260,7 +13259,8 @@
       </informaltable>
 
       <para>
-        Briefly, the server uses the grant tables as follows:
+        Briefly, the server uses the grant tables in the following
+        manner:
       </para>
 
       <itemizedlist>
@@ -13311,10 +13311,13 @@
 
           <para>
             <emphasis role="bold">Note</emphasis>: The
-            <literal>host</literal> table is not affected by the
-            <literal>GRANT</literal> and <literal>REVOKE</literal>
-            statements. Most MySQL installations need not use this table
-            at all.
+            <literal>host</literal> table must be modified directly with
+            statements such as <literal>INSERT</literal>,
+            <literal>UPDATE</literal>, and <literal>DELETE</literal>. It
+            is not affected by statements such as
+            <literal>GRANT</literal> and <literal>REVOKE</literal> that
+            modify the grant tables indirectly. Most MySQL installations
+            need not use this table at all.
           </para>
         </listitem>
 
@@ -13375,8 +13378,9 @@
         When you modify the contents of the grant tables, it is a good
         idea to make sure that your changes set up privileges the way
         you want. To check the privileges for a given account, use the
-        <literal>SHOW GRANTS</literal> statement. For example, to
-        determine the privileges that are granted to an account with
+        <literal>SHOW GRANTS</literal> statement. (See
+        <xref linkend="show-grants"/>.) For example, to determine the
+        privileges that are granted to an account with
         <literal>Host</literal> and <literal>User</literal> values of
         <literal>pc84.example.com</literal> and <literal>bob</literal>,
         issue this statement:
@@ -13387,19 +13391,6 @@
 </programlisting>
 
       <para>
-        A useful diagnostic tool is the <command>mysqlaccess</command>
-        script, which Yves Carlier has provided for the MySQL
-        distribution. Invoke <command>mysqlaccess</command> with the
-        <option>--help</option> option to find out how it works. Note
-        that <command>mysqlaccess</command> checks access using only the
-        <literal>user</literal>, <literal>db</literal>, and
-        <literal>host</literal> tables. It does not check table, column,
-        or routine privileges specified in the
-        <literal>tables_priv</literal>, <literal>columns_priv</literal>,
-        or <literal>procs_priv</literal> tables.
-      </para>
-
-      <para>
         For additional help in diagnosing privilege-related problems,
         see <xref linkend="access-denied"/>. For general advice on
         security issues, see <xref linkend="security"/>.
@@ -13445,9 +13436,9 @@
 
       <informaltable>
         <tgroup cols="3">
+          <colspec colwidth="30*"/>
           <colspec colwidth="33*"/>
-          <colspec colwidth="33*"/>
-          <colspec colwidth="34*"/>
+          <colspec colwidth="37*"/>
           <tbody>
             <row>
               <entry><emphasis role="bold">Privilege</emphasis></entry>
@@ -13640,8 +13631,8 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>SELECT 1+1;</userinput>
-mysql&gt; <userinput>SELECT PI()*2;</userinput>
+SELECT 1+1;
+SELECT PI()*2;
 </programlisting>
 
       <para>
@@ -13684,7 +13675,8 @@
         database directory, because the server can access any of those
         files.) The <literal>FILE</literal> privilege also enables the
         user to create new files in any directory where the MySQL server
-        has write access. Existing files cannot be overwritten.
+        has write access. As a security measure, the server will not
+        overwrite existing files.
       </para>
 
       <para>
@@ -13747,21 +13739,18 @@
 
       <para>
         The <literal>shutdown</literal> command shuts down the server.
-        This command can be issued only from
-        <command>mysqladmin</command>. There is no corresponding SQL
-        statement.
+        There is no corresponding SQL statement.
       </para>
 
       <para>
         The <literal>processlist</literal> command displays information
-        about the threads executing within the server (that is, about
-        the statements being executed by clients associated with other
-        accounts). The <literal>kill</literal> command terminates server
-        threads. You can always display or kill your own threads, but
-        you need the <literal>PROCESS</literal> privilege to display
-        threads initiated by other users and the
-        <literal>SUPER</literal> privilege to kill them. See
-        <xref linkend="kill"/>.
+        about the threads executing within the server (that is,
+        information about the statements being executed by clients). The
+        <literal>kill</literal> command terminates server threads. You
+        can always display or kill your own threads, but you need the
+        <literal>PROCESS</literal> privilege to display threads
+        initiated by other users and the <literal>SUPER</literal>
+        privilege to kill them. See <xref linkend="kill"/>.
       </para>
 
       <para>
@@ -13799,14 +13788,14 @@
         privilege see only databases for which they have some
         privileges, and cannot use the statement at all if the server
         was started with the <option>--skip-show-database</option>
-        option. Note that any global privilege is a privilege for the
-        database.
+        option. Note that <emphasis>any</emphasis> global privilege is a
+        privilege for the database.
       </para>
 
       <para>
-        It is a good idea in general to grant to an account only those
-        privileges that it needs. You should exercise particular caution
-        in granting the <literal>FILE</literal> and administrative
+        It is a good idea to grant to an account only those privileges
+        that it needs. You should exercise particular caution in
+        granting the <literal>FILE</literal> and administrative
         privileges:
       </para>
 
@@ -13936,8 +13925,8 @@
       </indexterm>
 
       <para>
-        MySQL client programs generally expect you to specify connection
-        parameters when you want to access a MySQL server:
+        MySQL client programs generally expect you to specify certain
+        connection parameters when you want to access a MySQL server:
       </para>
 
       <itemizedlist>
@@ -14017,7 +14006,8 @@
 
         <listitem>
           <para>
-            No password is supplied if <option>-p</option> is missing.
+            No password is supplied if neither <option>-p</option> nor
+            <option>--password</option>is given.
           </para>
         </listitem>
 
@@ -14068,8 +14058,8 @@
 </programlisting>
 
           <para>
-            Option files are discussed further in
-            <xref linkend="option-files"/>.
+            <xref linkend="option-files"/>, discusses option files
+            further.
           </para>
 
           <indexterm type="type">

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-28 20:55:43 UTC (rev 1086)
+++ trunk/refman-5.1/database-administration.xml	2006-01-28 23:41:44 UTC (rev 1087)
@@ -12683,7 +12683,8 @@
       </para>
 
       <para>
-        MySQL access control involves two stages:
+        MySQL access control involves two stages when you run a client
+        program that connects to the server:
       </para>
 
       <itemizedlist>
@@ -12712,8 +12713,8 @@
       <para>
         If your privileges are changed (either by yourself or someone
         else) while you are connected, those changes do not necessarily
-        take effect immediately for the next statement you issue. See
-        <xref linkend="privilege-changes"/>, for details.
+        take effect immediately for the next statement that you issue.
+        See <xref linkend="privilege-changes"/>, for details.
       </para>
 
       <para>
@@ -12728,13 +12729,12 @@
 
       <para>
         Normally, you manipulate the contents of the grant tables
-        indirectly by using the <literal>GRANT</literal> and
-        <literal>REVOKE</literal> statements to set up accounts and
-        control the privileges available to each one. See
-        <xref linkend="grant"/>, and
-        <xref linkend="revoke"/>. The discussion here describes the
-        underlying structure of the grant tables and how the server uses
-        their contents when interacting with clients.
+        indirectly by using statements such as <literal>GRANT</literal>
+        and <literal>REVOKE</literal> to set up accounts and control the
+        privileges available to each one. See
+        <xref linkend="account-management-sql"/>. The discussion here
+        describes the underlying structure of the grant tables and how
+        the server uses their contents when interacting with clients.
       </para>
 
       <para>
@@ -13053,8 +13053,7 @@
 
       <para>
         The <literal>Timestamp</literal> and <literal>Grantor</literal>
-        columns currently are unused and are not discussed any further
-        here.
+        columns currently are unused and are discussed no further here.
       </para>
 
       <para>
@@ -13130,7 +13129,7 @@
 
         <listitem>
           <para>
-            Scope columns determine the scope of each entry (row) in the
+            Scope columns determine the scope of each row (entry) in the
             tables; that is, the context in which the row applies. For
             example, a <literal>user</literal> table row with
             <literal>Host</literal> and <literal>User</literal> values
@@ -13151,7 +13150,7 @@
             <literal>columns_priv</literal> tables contain scope columns
             indicating tables or table/column combinations to which each
             row applies. The <literal>procs_priv</literal> scope columns
-            indicate the store routine to which each row applies.
+            indicate the stored routine to which each row applies.
           </para>
         </listitem>
 
@@ -13224,8 +13223,8 @@
         <literal>Host</literal> values are case-insensitive.
         <literal>User</literal>, <literal>Password</literal>,
         <literal>Db</literal>, and <literal>Table_name</literal> values
-        are case sensitive. <literal>Column_name</literal> values are
-        case insensitive.
+        are case sensitive. <literal>Column_name</literal> and
+        <literal>Routine_name</literal> values are case insensitive.
       </para>
 
       <para>
@@ -13247,8 +13246,8 @@
 
       <informaltable>
         <tgroup cols="3">
+          <colspec colwidth="20*"/>
           <colspec colwidth="15*"/>
-          <colspec colwidth="15*"/>
           <colspec colwidth="55*"/>
           <tbody>
             <row>
@@ -13282,7 +13281,8 @@
       </informaltable>
 
       <para>
-        Briefly, the server uses the grant tables as follows:
+        Briefly, the server uses the grant tables in the following
+        manner:
       </para>
 
       <itemizedlist>
@@ -13333,10 +13333,13 @@
 
           <para>
             <emphasis role="bold">Note</emphasis>: The
-            <literal>host</literal> table is not affected by the
-            <literal>GRANT</literal> and <literal>REVOKE</literal>
-            statements. Most MySQL installations need not use this table
-            at all.
+            <literal>host</literal> table must be modified directly with
+            statements such as <literal>INSERT</literal>,
+            <literal>UPDATE</literal>, and <literal>DELETE</literal>. It
+            is not affected by statements such as
+            <literal>GRANT</literal> and <literal>REVOKE</literal> that
+            modify the grant tables indirectly. Most MySQL installations
+            need not use this table at all.
           </para>
         </listitem>
 
@@ -13397,8 +13400,9 @@
         When you modify the contents of the grant tables, it is a good
         idea to make sure that your changes set up privileges the way
         you want. To check the privileges for a given account, use the
-        <literal>SHOW GRANTS</literal> statement. For example, to
-        determine the privileges that are granted to an account with
+        <literal>SHOW GRANTS</literal> statement. (See
+        <xref linkend="show-grants"/>.) For example, to determine the
+        privileges that are granted to an account with
         <literal>Host</literal> and <literal>User</literal> values of
         <literal>pc84.example.com</literal> and <literal>bob</literal>,
         issue this statement:
@@ -13409,19 +13413,6 @@
 </programlisting>
 
       <para>
-        A useful diagnostic tool is the <command>mysqlaccess</command>
-        script, which Yves Carlier has provided for the MySQL
-        distribution. Invoke <command>mysqlaccess</command> with the
-        <option>--help</option> option to find out how it works. Note
-        that <command>mysqlaccess</command> checks access using only the
-        <literal>user</literal>, <literal>db</literal>, and
-        <literal>host</literal> tables. It does not check table, column,
-        or routine privileges specified in the
-        <literal>tables_priv</literal>, <literal>columns_priv</literal>,
-        or <literal>procs_priv</literal> tables.
-      </para>
-
-      <para>
         For additional help in diagnosing privilege-related problems,
         see <xref linkend="access-denied"/>. For general advice on
         security issues, see <xref linkend="security"/>.
@@ -13467,9 +13458,9 @@
 
       <informaltable>
         <tgroup cols="3">
+          <colspec colwidth="30*"/>
           <colspec colwidth="33*"/>
-          <colspec colwidth="33*"/>
-          <colspec colwidth="34*"/>
+          <colspec colwidth="37*"/>
           <tbody>
             <row>
               <entry><emphasis role="bold">Privilege</emphasis></entry>
@@ -13654,8 +13645,8 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>SELECT 1+1;</userinput>
-mysql&gt; <userinput>SELECT PI()*2;</userinput>
+SELECT 1+1;
+SELECT PI()*2;
 </programlisting>
 
       <para>
@@ -13698,7 +13689,8 @@
         database directory, because the server can access any of those
         files.) The <literal>FILE</literal> privilege also enables the
         user to create new files in any directory where the MySQL server
-        has write access. Existing files cannot be overwritten.
+        has write access. As a security measure, the server will not
+        overwrite existing files.
       </para>
 
       <para>
@@ -13761,21 +13753,18 @@
 
       <para>
         The <literal>shutdown</literal> command shuts down the server.
-        This command can be issued only from
-        <command>mysqladmin</command>. There is no corresponding SQL
-        statement.
+        There is no corresponding SQL statement.
       </para>
 
       <para>
         The <literal>processlist</literal> command displays information
-        about the threads executing within the server (that is, about
-        the statements being executed by clients associated with other
-        accounts). The <literal>kill</literal> command terminates server
-        threads. You can always display or kill your own threads, but
-        you need the <literal>PROCESS</literal> privilege to display
-        threads initiated by other users and the
-        <literal>SUPER</literal> privilege to kill them. See
-        <xref linkend="kill"/>.
+        about the threads executing within the server (that is,
+        information about the statements being executed by clients). The
+        <literal>kill</literal> command terminates server threads. You
+        can always display or kill your own threads, but you need the
+        <literal>PROCESS</literal> privilege to display threads
+        initiated by other users and the <literal>SUPER</literal>
+        privilege to kill them. See <xref linkend="kill"/>.
       </para>
 
       <para>
@@ -13813,14 +13802,14 @@
         privilege see only databases for which they have some
         privileges, and cannot use the statement at all if the server
         was started with the <option>--skip-show-database</option>
-        option. Note that any global privilege is a privilege for the
-        database.
+        option. Note that <emphasis>any</emphasis> global privilege is a
+        privilege for the database.
       </para>
 
       <para>
-        It is a good idea in general to grant to an account only those
-        privileges that it needs. You should exercise particular caution
-        in granting the <literal>FILE</literal> and administrative
+        It is a good idea to grant to an account only those privileges
+        that it needs. You should exercise particular caution in
+        granting the <literal>FILE</literal> and administrative
         privileges:
       </para>
 
@@ -13950,8 +13939,8 @@
       </indexterm>
 
       <para>
-        MySQL client programs generally expect you to specify connection
-        parameters when you want to access a MySQL server:
+        MySQL client programs generally expect you to specify certain
+        connection parameters when you want to access a MySQL server:
       </para>
 
       <itemizedlist>
@@ -14031,7 +14020,8 @@
 
         <listitem>
           <para>
-            No password is supplied if <option>-p</option> is missing.
+            No password is supplied if neither <option>-p</option> nor
+            <option>--password</option>is given.
           </para>
         </listitem>
 
@@ -14082,8 +14072,8 @@
 </programlisting>
 
           <para>
-            Option files are discussed further in
-            <xref linkend="option-files"/>.
+            <xref linkend="option-files"/>, discusses option files
+            further.
           </para>
 
           <indexterm type="type">

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