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

Log:
 r6728@frost:  paul | 2006-01-26 21:26:56 -0600
 General revisions.


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


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

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-27 04:02:06 UTC (rev 1055)
+++ trunk/refman-4.1/database-administration.xml	2006-01-27 04:02:22 UTC (rev 1056)
@@ -2210,7 +2210,7 @@
 | innodb_data_file_path           | ibdata1:10M:autoextend              |
 | innodb_data_home_dir            |                                     |
 ...
-| version                         | 4.1.13-max-log                      |
+| version                         | 4.1.18-max-log                      |
 | version_comment                 | MySQL Community Edition - Max (GPL) |
 | version_compile_machine         | i686                                |
 | version_compile_os              | pc-linux-gnu                        |

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-27 04:02:06 UTC (rev 1055)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-27 04:02:22 UTC (rev 1056)
@@ -15253,9 +15253,9 @@
             </para>
 
             <para>
-              The storage engine for the table. Before MySQL 4.1.2, this
-              value is labeled as <literal>Type</literal>. See
-              <xref linkend="storage-engines"/>.
+              The storage engine for the table. See
+              <xref linkend="storage-engines"/>. Before MySQL 4.1.2,
+              this value is labeled as <literal>Type</literal>.
             </para>
           </listitem>
 
@@ -15557,15 +15557,11 @@
           for new connections to MySQL. With <literal>SESSION</literal>,
           you get the values that are in effect for the current
           connection. If you use neither option, the default is
-          <literal>SESSION</literal>.
+          <literal>SESSION</literal>. <literal>LOCAL</literal> is a
+          synonym for <literal>SESSION</literal>.
         </para>
 
         <para>
-          <literal>LOCAL</literal> is a synonym for
-          <literal>SESSION</literal>.
-        </para>
-
-        <para>
           If the default values are unsuitable, you can set most of
           these variables using command options when
           <command>mysqld</command> starts or at runtime with the
@@ -15576,11 +15572,11 @@
 
         <para>
           Partial output is shown here. The list of variables and their
-          values may be different for your server. The meaning of each
-          variable is given in
-          <xref linkend="server-system-variables"/>. Information about
-          tuning them is provided in
-          <xref linkend="server-parameters"/>.
+          values may be different for your server.
+          <xref linkend="server-system-variables"/>, describes the
+          meaning of each variable, and
+          <xref linkend="server-parameters"/>, provides information
+          about tuning them.
         </para>
 
 <programlisting>
@@ -15606,7 +15602,7 @@
 | timezone                        | EEST                         |
 | tmp_table_size                  | 33554432                     |
 | tmpdir                          | /tmp/:/mnt/hd2/tmp/          |
-| version                         | 4.1.4-beta                   |
+| version                         | 4.1.18                       |
 | wait_timeout                    | 28800                        |
 +---------------------------------+------------------------------+
 </programlisting>
@@ -15950,7 +15946,7 @@
         <para>
           Index assignment affects the server globally: If one client
           assigns an index to a given cache, this cache is used for all
-          queries involving the index, no matter what client issues the
+          queries involving the index, no matter which client issues the
           queries.
         </para>
 
@@ -15997,12 +15993,17 @@
         <remark role="help-description-begin"/>
 
         <para>
-          You should use the <literal>FLUSH</literal> statement if you
-          want to clear some of the internal caches MySQL uses. To
-          execute <literal>FLUSH</literal>, you must have the
+          The <literal>FLUSH</literal> statement clears or reloads
+          various internal caches used by MySQL. To execute
+          <literal>FLUSH</literal>, you must have the
           <literal>RELOAD</literal> privilege.
         </para>
 
+        <para>
+          The <literal>RESET</literal> statement is similar to
+          <literal>FLUSH</literal>. See <xref linkend="reset"/>.
+        </para>
+
         <remark role="help-description-end"/>
 
         <para>
@@ -16021,14 +16022,14 @@
               Empties the host cache tables. You should flush the host
               tables if some of your hosts change IP number or if you
               get the error message <literal>Host
-              <replaceable>host_name</replaceable> is blocked</literal>.
-              When more than <literal>max_connect_errors</literal>
-              errors occur successively for a given host while
-              connecting to the MySQL server, MySQL assumes that
-              something is wrong and blocks the host from further
-              connection requests. Flushing the host tables allows the
-              host to attempt to connect again. See
-              <xref linkend="blocked-host"/>. You can start
+              '<replaceable>host_name</replaceable>' is
+              blocked</literal>. When more than
+              <literal>max_connect_errors</literal> errors occur
+              successively for a given host while connecting to the
+              MySQL server, MySQL assumes that something is wrong and
+              blocks the host from further connection requests. Flushing
+              the host tables allows the host to attempt to connect
+              again. See <xref linkend="blocked-host"/>. You can start
               <command>mysqld</command> with
               <option>--max_connect_errors=999999999</option> to avoid
               this error message.

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-27 04:02:06 UTC (rev 1055)
+++ trunk/refman-5.0/database-administration.xml	2006-01-27 04:02:22 UTC (rev 1056)
@@ -2168,7 +2168,7 @@
 | innodb_data_file_path           | ibdata1:10M:autoextend              |
 | innodb_data_home_dir            |                                     |
 ...
-| version                         | 5.0.13-rc-Max                       |
+| version                         | 5.0.19-Max                          |
 | version_comment                 | MySQL Community Edition - Max (GPL) |
 | version_compile_machine         | i686                                |
 | version_compile_os              | pc-linux-gnu                        |

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-27 04:02:06 UTC (rev 1055)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-27 04:02:22 UTC (rev 1056)
@@ -16481,17 +16481,6 @@
         </para>
 
         <para>
-          Beginning with MySQL 5.0.3, for <literal>NDB Cluster</literal>
-          tables, the output of this statement shows appropriate values
-          for the <literal>Avg_row_length</literal> and
-          <literal>Data_length</literal> columns, with the exception
-          that <literal>BLOB</literal> columns are not taken into
-          account. In addition, the number of replicas is now shown in
-          the <literal>Comment</literal> column (as
-          <literal>number_of_replicas</literal>).
-        </para>
-
-        <para>
           <literal>SHOW TABLE STATUS</literal> returns the following
           fields:
         </para>
@@ -16514,9 +16503,9 @@
             </para>
 
             <para>
-              The storage engine for the table. Before MySQL 4.1.2, this
-              value is labeled as <literal>Type</literal>. See
-              <xref linkend="storage-engines"/>.
+              The storage engine for the table. See
+              <xref linkend="storage-engines"/>. Before MySQL 4.1.2,
+              this value is labeled as <literal>Type</literal>.
             </para>
           </listitem>
 
@@ -16726,8 +16715,8 @@
         </para>
 
         <para>
-          For <literal>MEMORY</literal> (<literal>HEAP</literal>)
-          tables, the <literal>Data_length</literal>,
+          For <literal>MEMORY</literal> tables, the
+          <literal>Data_length</literal>,
           <literal>Max_data_length</literal>, and
           <literal>Index_length</literal> values approximate the actual
           amount of allocated memory. The allocation algorithm reserves
@@ -16736,6 +16725,17 @@
         </para>
 
         <para>
+          Beginning with MySQL 5.0.3, for <literal>NDB Cluster</literal>
+          tables, the output of this statement shows appropriate values
+          for the <literal>Avg_row_length</literal> and
+          <literal>Data_length</literal> columns, with the exception
+          that <literal>BLOB</literal> columns are not taken into
+          account. In addition, the number of replicas is now shown in
+          the <literal>Comment</literal> column (as
+          <literal>number_of_replicas</literal>).
+        </para>
+
+        <para>
           For views, all the fields displayed by <literal>SHOW TABLE
           STATUS</literal> are <literal>NULL</literal> except that
           <literal>Name</literal> indicates the view name and
@@ -16822,8 +16822,9 @@
 
         <para>
           <literal>SHOW TRIGGERS</literal> lists the triggers currently
-          defined on the MySQL server. It was implemented in MySQL
-          5.0.10.
+          defined on the MySQL server. This statement requires the
+          <literal>SUPER</literal> privilege. It was implemented in
+          MySQL 5.0.10.
         </para>
 
         <para>
@@ -16870,62 +16871,91 @@
 
           <listitem>
             <para>
-              <literal>Trigger</literal>: The name of the trigger.
+              <literal>Trigger</literal>
             </para>
+
+            <para>
+              The name of the trigger.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Event</literal>: The event invoking the trigger.
-              Must be one of <literal>'INSERT'</literal>,
-              <literal>'UPDATE'</literal>, or
-              <literal>'DELETE'</literal>.
+              <literal>Event</literal>
             </para>
+
+            <para>
+              The event that causes trigger activation: one of
+              <literal>'INSERT'</literal>, <literal>'UPDATE'</literal>,
+              or <literal>'DELETE'</literal>.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Table</literal>: The table for which the trigger
-              is defined.
+              <literal>Table</literal>
             </para>
+
+            <para>
+              The table for which the trigger is defined.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Statement</literal>: The statement to be executed
-              when the trigger is invoked. This is the same as the text
-              shown in the <literal>ACTION_STATEMENT</literal> column of
+              <literal>Statement</literal>
+            </para>
+
+            <para>
+              The statement to be executed when the trigger is
+              activated. This is the same as the text shown in the
+              <literal>ACTION_STATEMENT</literal> column of
               <literal>INFORMATION_SCHEMA.TRIGGERS</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Timing</literal>: One of the two values
-              <literal>'BEFORE'</literal> or <literal>'AFTER'</literal>.
+              <literal>Timing</literal>
             </para>
+
+            <para>
+              One of the two values <literal>'BEFORE'</literal> or
+              <literal>'AFTER'</literal>.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Created</literal>: Currently the value of this
-              column is always <literal>NULL</literal>.
+              <literal>Created</literal>
             </para>
+
+            <para>
+              Currently, the value of this column is always
+              <literal>NULL</literal>.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>sql_mode</literal>: The SQL mode in effect when
-              the trigger executes. This column was added in MySQL
-              5.0.11.
+              <literal>sql_mode</literal>
             </para>
+
+            <para>
+              The SQL mode in effect when the trigger executes. This
+              column was added in MySQL 5.0.11.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Definer</literal>: The account that created the
-              trigger. This column was added in MySQL 5.0.17.
+              <literal>Definer</literal>
             </para>
+
+            <para>
+              The account that created the trigger. This column was
+              added in MySQL 5.0.17.
+            </para>
           </listitem>
 
         </itemizedlist>
@@ -16983,9 +17013,6 @@
           <literal>SESSION</literal>, you get the values that are in
           effect for the current connection. If you use neither option,
           the default is <literal>SESSION</literal>.
-        </para>
-
-        <para>
           <literal>LOCAL</literal> is a synonym for
           <literal>SESSION</literal>.
         </para>
@@ -17001,55 +17028,50 @@
 
         <para>
           Partial output is shown here. The list of variables and their
-          values may be different for your server. The meaning of each
-          variable is given in
-          <xref linkend="server-system-variables"/>. Information about
-          tuning them is provided in
-          <xref linkend="server-parameters"/>.
+          values may be different for your server.
+          <xref linkend="server-system-variables"/>, describes the
+          meaning of each variable, and
+          <xref linkend="server-parameters"/>, provides information
+          about tuning them.
         </para>
 
-        <remark>
-          Output from 5.0.7-beta; update as needed.
-        </remark>
-
 <programlisting>
 mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+---------------------------------+---------------------------------------------------------+
-| Variable_name                   | Value                                                   |
-+---------------------------------+---------------------------------------------------------+
-| auto_increment_increment        | 1                                                       |
-| auto_increment_offset           | 1                                                       |
-| automatic_sp_privileges         | ON                                                      |
-| back_log                        | 50                                                      |
-| basedir                         | /                                                       |
-| bdb_cache_size                  | 8388600                                                 |
-| bdb_home                        | /var/lib/mysql/                                         |
-| bdb_log_buffer_size             | 32768                                                   |
++---------------------------------+-------------------------------------+   
+| Variable_name                   | Value                               |
++---------------------------------+-------------------------------------+   
+| auto_increment_increment        | 1                                   |
+| auto_increment_offset           | 1                                   |
+| automatic_sp_privileges         | ON                                  |
+| back_log                        | 50                                  |
+| basedir                         | /                                   |
+| bdb_cache_size                  | 8388600                             |
+| bdb_home                        | /var/lib/mysql/                     |
+| bdb_log_buffer_size             | 32768                               |
 ...                               ...                                                       ...    
-| max_connections                 | 100                                                     |
-| max_connect_errors              | 10                                                      |
-| max_delayed_threads             | 20                                                      |
-| max_error_count                 | 64                                                      |
-| max_heap_table_size             | 16777216                                                |
-| max_join_size                   | 4294967295                                              |
-| max_relay_log_size              | 0                                                       |
-| max_sort_length                 | 1024                                                    |
+| max_connections                 | 100                                 |
+| max_connect_errors              | 10                                  |
+| max_delayed_threads             | 20                                  |
+| max_error_count                 | 64                                  |
+| max_heap_table_size             | 16777216                            |
+| max_join_size                   | 4294967295                          |
+| max_relay_log_size              | 0                                   |
+| max_sort_length                 | 1024                                |
 ...                               ...                                                       ...    
-| time_zone                       | SYSTEM                                                  |
-| timed_mutexes                   | OFF                                                     |
-| tmp_table_size                  | 33554432                                                |
-| tmpdir                          |                                                         |
-| transaction_alloc_block_size    | 8192                                                    |
-| transaction_prealloc_size       | 4096                                                    |
-| tx_isolation                    | REPEATABLE-READ                                         |
-| updatable_views_with_limit      | YES                                                     |
-| version                         | 5.0.7-beta-Max                                          |
-| version_bdb                     | Sleepycat Software: Berkeley DB 4.1.24: (June 11, 2005) |
-| version_comment                 | MySQL Community Edition - Max (GPL)                     |
-| version_compile_machine         | i686                                                    |
-| version_compile_os              | pc-linux-gnu                                            |
-| wait_timeout                    | 28800                                                   |
-+---------------------------------+---------------------------------------------------------+   
+| time_zone                       | SYSTEM                              |
+| timed_mutexes                   | OFF                                 |
+| tmp_table_size                  | 33554432                            |
+| tmpdir                          |                                     |
+| transaction_alloc_block_size    | 8192                                |
+| transaction_prealloc_size       | 4096                                |
+| tx_isolation                    | REPEATABLE-READ                     |
+| updatable_views_with_limit      | YES                                 |
+| version                         | 5.0.19-Max                          |
+| version_comment                 | MySQL Community Edition - Max (GPL) |
+| version_compile_machine         | i686                                |
+| version_compile_os              | pc-linux-gnu                        |
+| wait_timeout                    | 28800                               |
++---------------------------------+-------------------------------------+   
 </programlisting>
 
         <para>
@@ -17389,7 +17411,7 @@
         <para>
           Index assignment affects the server globally: If one client
           assigns an index to a given cache, this cache is used for all
-          queries involving the index, no matter what client issues the
+          queries involving the index, no matter which client issues the
           queries.
         </para>
 
@@ -17432,12 +17454,17 @@
         <remark role="help-description-begin"/>
 
         <para>
-          You should use the <literal>FLUSH</literal> statement if you
-          want to clear some of the internal caches MySQL uses. To
-          execute <literal>FLUSH</literal>, you must have the
+          The <literal>FLUSH</literal> statement clears or reloads
+          various internal caches used by MySQL. To execute
+          <literal>FLUSH</literal>, you must have the
           <literal>RELOAD</literal> privilege.
         </para>
 
+        <para>
+          The <literal>RESET</literal> statement is similar to
+          <literal>FLUSH</literal>. See <xref linkend="reset"/>.
+        </para>
+
         <remark role="help-description-end"/>
 
         <para>
@@ -17456,14 +17483,14 @@
               Empties the host cache tables. You should flush the host
               tables if some of your hosts change IP number or if you
               get the error message <literal>Host
-              <replaceable>host_name</replaceable> is blocked</literal>.
-              When more than <literal>max_connect_errors</literal>
-              errors occur successively for a given host while
-              connecting to the MySQL server, MySQL assumes that
-              something is wrong and blocks the host from further
-              connection requests. Flushing the host tables allows the
-              host to attempt to connect again. See
-              <xref linkend="blocked-host"/>. You can start
+              '<replaceable>host_name</replaceable>' is
+              blocked</literal>. When more than
+              <literal>max_connect_errors</literal> errors occur
+              successively for a given host while connecting to the
+              MySQL server, MySQL assumes that something is wrong and
+              blocks the host from further connection requests. Flushing
+              the host tables allows the host to attempt to connect
+              again. See <xref linkend="blocked-host"/>. You can start
               <command>mysqld</command> with
               <option>--max_connect_errors=999999999</option> to avoid
               this error message.

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-27 04:02:06 UTC (rev 1055)
+++ trunk/refman-5.1/database-administration.xml	2006-01-27 04:02:22 UTC (rev 1056)
@@ -2158,7 +2158,7 @@
 | innodb_data_file_path           | ibdata1:10M:autoextend               |
 | innodb_data_home_dir            |                                      |
 ...
-| version                         | 5.1.2-alpha-log                      |
+| version                         | 5.1.6-alpha-log                      |
 | version_comment                 | Source distribution                  |
 | version_compile_machine         | i686                                 |
 | version_compile_os              | suse-linux                           |

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-27 04:02:06 UTC (rev 1055)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-27 04:02:22 UTC (rev 1056)
@@ -17014,17 +17014,6 @@
         </para>
 
         <para>
-          For <literal>NDB Cluster</literal> tables, the output of this
-          statement shows appropriate values for the
-          <literal>Avg_row_length</literal> and
-          <literal>Data_length</literal> columns, with the exception
-          that <literal>BLOB</literal> columns are not taken into
-          account. In addition, the number of replicas is shown in the
-          <literal>Comment</literal> column (as
-          <literal>number_of_replicas</literal>).
-        </para>
-
-        <para>
           <literal>SHOW TABLE STATUS</literal> returns the following
           fields:
         </para>
@@ -17047,9 +17036,9 @@
             </para>
 
             <para>
-              The storage engine for the table. Before MySQL 4.1.2, this
-              value is labeled as <literal>Type</literal>. See
-              <xref linkend="storage-engines"/>.
+              The storage engine for the table. See
+              <xref linkend="storage-engines"/>. Before MySQL 4.1.2,
+              this value is labeled as <literal>Type</literal>.
             </para>
           </listitem>
 
@@ -17256,8 +17245,8 @@
         </para>
 
         <para>
-          For <literal>MEMORY</literal> (<literal>HEAP</literal>)
-          tables, the <literal>Data_length</literal>,
+          For <literal>MEMORY</literal> tables, the
+          <literal>Data_length</literal>,
           <literal>Max_data_length</literal>, and
           <literal>Index_length</literal> values approximate the actual
           amount of allocated memory. The allocation algorithm reserves
@@ -17266,6 +17255,17 @@
         </para>
 
         <para>
+          For <literal>NDB Cluster</literal> tables, the output of this
+          statement shows appropriate values for the
+          <literal>Avg_row_length</literal> and
+          <literal>Data_length</literal> columns, with the exception
+          that <literal>BLOB</literal> columns are not taken into
+          account. In addition, the number of replicas is shown in the
+          <literal>Comment</literal> column (as
+          <literal>number_of_replicas</literal>).
+        </para>
+
+        <para>
           For views, all the fields displayed by <literal>SHOW TABLE
           STATUS</literal> are <literal>NULL</literal> except that
           <literal>Name</literal> indicates the view name and
@@ -17349,7 +17349,8 @@
 
         <para>
           <literal>SHOW TRIGGERS</literal> lists the triggers currently
-          defined on the MySQL server.
+          defined on the MySQL server. This statement requires the
+          <literal>SUPER</literal> privilege.
         </para>
 
         <para>
@@ -17396,71 +17397,94 @@
 
           <listitem>
             <para>
-              <literal>Trigger</literal>: The name of the trigger.
+              <literal>Trigger</literal>
             </para>
+
+            <para>
+              The name of the trigger.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Event</literal>: The event invoking the trigger.
-              Must be one of <literal>'INSERT'</literal>,
-              <literal>'UPDATE'</literal>, or
-              <literal>'DELETE'</literal>.
+              <literal>Event</literal>
             </para>
+
+            <para>
+              The event that causes trigger activation: one of
+              <literal>'INSERT'</literal>, <literal>'UPDATE'</literal>,
+              or <literal>'DELETE'</literal>.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Table</literal>: The table for which the trigger
-              is defined.
+              <literal>Table</literal>
             </para>
+
+            <para>
+              The table for which the trigger is defined.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Statement</literal>: The statement to be executed
-              when the trigger is invoked. This is the same as the text
-              shown in the <literal>ACTION_STATEMENT</literal> column of
+              <literal>Statement</literal>
+            </para>
+
+            <para>
+              The statement to be executed when the trigger is
+              activated. This is the same as the text shown in the
+              <literal>ACTION_STATEMENT</literal> column of
               <literal>INFORMATION_SCHEMA.TRIGGERS</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Timing</literal>: One of the two values
-              <literal>'BEFORE'</literal> or <literal>'AFTER'</literal>.
+              <literal>Timing</literal>
             </para>
+
+            <para>
+              One of the two values <literal>'BEFORE'</literal> or
+              <literal>'AFTER'</literal>.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Created</literal>: Currently the value of this
-              column is always <literal>NULL</literal>.
+              <literal>Created</literal>
             </para>
+
+            <para>
+              Currently, the value of this column is always
+              <literal>NULL</literal>.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>sql_mode</literal>: The SQL mode in effect when
-              the trigger executes.
+              <literal>sql_mode</literal>
             </para>
+
+            <para>
+              The SQL mode in effect when the trigger executes.
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Definer</literal>: The account that created the
-              trigger.
+              <literal>Definer</literal>
             </para>
+
+            <para>
+              The account that created the trigger.
+            </para>
           </listitem>
 
         </itemizedlist>
 
         <para>
-          You must have the <literal>SUPER</literal> privilege to
-          execute <literal>SHOW TRIGGERS</literal>.
-        </para>
-
-        <para>
           See also <xref linkend="triggers-table"/>.
         </para>
 
@@ -17508,9 +17532,6 @@
           <literal>SESSION</literal>, you get the values that are in
           effect for the current connection. If you use neither option,
           the default is <literal>SESSION</literal>.
-        </para>
-
-        <para>
           <literal>LOCAL</literal> is a synonym for
           <literal>SESSION</literal>.
         </para>
@@ -17526,11 +17547,11 @@
 
         <para>
           Partial output is shown here. The list of variables and their
-          values may be different for your server. The meaning of each
-          variable is given in
-          <xref linkend="server-system-variables"/>. Information about
-          tuning them is provided in
-          <xref linkend="server-parameters"/>.
+          values may be different for your server.
+          <xref linkend="server-system-variables"/>, describes the
+          meaning of each variable, and
+          <xref linkend="server-parameters"/>, provides information
+          about tuning them.
         </para>
 
         <remark>
@@ -17539,45 +17560,45 @@
 
 <programlisting>
 mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+---------------------------------+-----------------------------------------------+
-| Variable_name                   | Value                                         |
-+---------------------------------+-----------------------------------------------+
-| auto_increment_increment        | 1                                             |
-| auto_increment_offset           | 1                                             |
-| automatic_sp_privileges         | ON                                            |
-| back_log                        | 50                                            |
-| basedir                         | /home/jon/bin/mysql-5.1/                      |
-| binlog_cache_size               | 32768                                         |
-| bulk_insert_buffer_size         | 8388608                                       |
-| character_set_client            | latin1                                        |
-| character_set_connection        | latin1                                        |
++---------------------------------+---------------------------+
+| Variable_name                   | Value                     |
++---------------------------------+---------------------------+
+| auto_increment_increment        | 1                         |
+| auto_increment_offset           | 1                         |
+| automatic_sp_privileges         | ON                        |
+| back_log                        | 50                        |
+| basedir                         | /home/jon/bin/mysql-5.1/  |
+| binlog_cache_size               | 32768                     |
+| bulk_insert_buffer_size         | 8388608                   |
+| character_set_client            | latin1                    |
+| character_set_connection        | latin1                    |
 ...                               ...                                              
-| max_user_connections            | 0                                             |
-| max_write_lock_count            | 4294967295                                    |
-| multi_range_count               | 256                                           |
-| myisam_data_pointer_size        | 6                                             |
-| myisam_max_sort_file_size       | 2147483647                                    |
-| myisam_recover_options          | OFF                                           |
-| myisam_repair_threads           | 1                                             |
-| myisam_sort_buffer_size         | 8388608                                       |
-| ndb_autoincrement_prefetch_sz   | 32                                            |
-| ndb_cache_check_time            | 0                                             |
-| ndb_force_send                  | ON                                            |
+| max_user_connections            | 0                         |
+| max_write_lock_count            | 4294967295                |
+| multi_range_count               | 256                       |
+| myisam_data_pointer_size        | 6                         |
+| myisam_max_sort_file_size       | 2147483647                |
+| myisam_recover_options          | OFF                       |
+| myisam_repair_threads           | 1                         |
+| myisam_sort_buffer_size         | 8388608                   |
+| ndb_autoincrement_prefetch_sz   | 32                        |
+| ndb_cache_check_time            | 0                         |
+| ndb_force_send                  | ON                        |
 ...                               ...                                                       ...    
-| time_zone                       | SYSTEM                                        |
-| timed_mutexes                   | OFF                                           |
-| tmp_table_size                  | 33554432                                      |
-| tmpdir                          |                                               |
-| transaction_alloc_block_size    | 8192                                          |
-| transaction_prealloc_size       | 4096                                          |
-| tx_isolation                    | REPEATABLE-READ                               |
-| updatable_views_with_limit      | YES                                           |
-| version                         | 5.1.2-alpha-log                               |
-| version_comment                 | Source distribution                           |
-| version_compile_machine         | i686                                          |
-| version_compile_os              | suse-linux                                    |
-| wait_timeout                    | 28800                                         |
-+---------------------------------+-----------------------------------------------+
+| time_zone                       | SYSTEM                    |
+| timed_mutexes                   | OFF                       |
+| tmp_table_size                  | 33554432                  |
+| tmpdir                          |                           |
+| transaction_alloc_block_size    | 8192                      |
+| transaction_prealloc_size       | 4096                      |
+| tx_isolation                    | REPEATABLE-READ           |
+| updatable_views_with_limit      | YES                       |
+| version                         | 5.1.6-alpha-log           |
+| version_comment                 | Source distribution       |
+| version_compile_machine         | i686                      |
+| version_compile_os              | suse-linux                |
+| wait_timeout                    | 28800                     |
++---------------------------------+---------------------------+
 </programlisting>
 
         <para>
@@ -17917,7 +17938,7 @@
         <para>
           Index assignment affects the server globally: If one client
           assigns an index to a given cache, this cache is used for all
-          queries involving the index, no matter what client issues the
+          queries involving the index, no matter which client issues the
           queries.
         </para>
 
@@ -17960,12 +17981,17 @@
         <remark role="help-description-begin"/>
 
         <para>
-          You should use the <literal>FLUSH</literal> statement if you
-          want to clear some of the internal caches MySQL uses. To
-          execute <literal>FLUSH</literal>, you must have the
+          The <literal>FLUSH</literal> statement clears or reloads
+          various internal caches used by MySQL. To execute
+          <literal>FLUSH</literal>, you must have the
           <literal>RELOAD</literal> privilege.
         </para>
 
+        <para>
+          The <literal>RESET</literal> statement is similar to
+          <literal>FLUSH</literal>. See <xref linkend="reset"/>.
+        </para>
+
         <remark role="help-description-end"/>
 
         <para>
@@ -17984,14 +18010,14 @@
               Empties the host cache tables. You should flush the host
               tables if some of your hosts change IP number or if you
               get the error message <literal>Host
-              <replaceable>host_name</replaceable> is blocked</literal>.
-              When more than <literal>max_connect_errors</literal>
-              errors occur successively for a given host while
-              connecting to the MySQL server, MySQL assumes that
-              something is wrong and blocks the host from further
-              connection requests. Flushing the host tables allows the
-              host to attempt to connect again. See
-              <xref linkend="blocked-host"/>. You can start
+              '<replaceable>host_name</replaceable>' is
+              blocked</literal>. When more than
+              <literal>max_connect_errors</literal> errors occur
+              successively for a given host while connecting to the
+              MySQL server, MySQL assumes that something is wrong and
+              blocks the host from further connection requests. Flushing
+              the host tables allows the host to attempt to connect
+              again. See <xref linkend="blocked-host"/>. You can start
               <command>mysqld</command> with
               <option>--max_connect_errors=999999999</option> to avoid
               this error message.

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