List:Commits« Previous MessageNext Message »
From:paul Date:January 29 2006 1:03am
Subject:svn commit - mysqldoc@docsrva: r1094 - in trunk: . refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-29 02:03:24 +0100 (Sun, 29 Jan 2006)
New Revision: 1094

Log:
 r6840@frost:  paul | 2006-01-28 18:16:59 -0600
 Restructuring.


Modified:
   trunk/
   trunk/refman-5.0/information-schema.xml
   trunk/refman-5.0/renamed-nodes.txt
   trunk/refman-5.1/information-schema.xml
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml	2006-01-28 23:48:21 UTC (rev 1093)
+++ trunk/refman-5.0/information-schema.xml	2006-01-29 01:03:24 UTC (rev 1094)
@@ -213,123 +213,114 @@
     order to see information about it.
   </para>
 
-  <section id="information-schema-tables">
+  <para>
+    <emphasis role="bold">Explanation of following sections</emphasis>
+  </para>
 
-    <title>&title-information-schema-tables;</title>
+  <para>
+    In the following sections, we take the tables and columns that are
+    in <literal>INFORMATION_SCHEMA</literal>. For each column, there are
+    three pieces of information:
+  </para>
 
-    <indexterm type="function">
-      <primary>INFORMATION_SCHEMA</primary>
-    </indexterm>
+  <itemizedlist>
 
-    <para>
-      <emphasis role="bold">Explanation of following sections</emphasis>
-    </para>
+    <listitem>
+      <para>
+        <quote>Standard Name</quote> indicates the standard SQL name for
+        the column.
+      </para>
+    </listitem>
 
-    <para>
-      In the following sections, we take the tables and columns that are
-      in <literal>INFORMATION_SCHEMA</literal>. For each column, there
-      are three pieces of information:
-    </para>
+    <listitem>
+      <para>
+        <quote><literal>SHOW</literal> name</quote> indicates what the
+        equivalent field name is in the closest <literal>SHOW</literal>
+        statement, if any.
+      </para>
+    </listitem>
 
-    <itemizedlist>
+    <listitem>
+      <para>
+        <quote>Remarks</quote> provides additional information where
+        applicable.
 
-      <listitem>
-        <para>
-          <quote>Standard Name</quote> indicates the standard SQL name
-          for the column.
-        </para>
-      </listitem>
+        <remark>
+          We have marked ``omit'' those columns for which MySQL has no
+          present use. We have omitted these columns, that is, they
+          appear in the standard but not in MySQL. So their presence
+          here is a matter of record only.
+        </remark>
+      </para>
+    </listitem>
 
-      <listitem>
-        <para>
-          <quote><literal>SHOW</literal> name</quote> indicates what the
-          equivalent field name is in the closest
-          <literal>SHOW</literal> statement, if any.
-        </para>
-      </listitem>
+  </itemizedlist>
 
-      <listitem>
-        <para>
-          <quote>Remarks</quote> provides additional information where
-          applicable.
+  <para>
+    To avoid using any name that is reserved in the standard or in DB2,
+    SQL Server, or Oracle, we changed the names of columns marked
+    <emphasis role="bold">MySQL extension</emphasis>. (For example, we
+    changed <literal>COLLATION</literal> to
+    <literal>TABLE_COLLATION</literal> in the <literal>TABLES</literal>
+    table.) See the list of reserved words near the end of this article:
+    <ulink url="http://www.dbazine.com/gulutzan5.shtml"/>.
+  </para>
 
-          <remark>
-            We have marked ``omit'' those columns for which MySQL has no
-            present use. We have omitted these columns, that is, they
-            appear in the standard but not in MySQL. So their presence
-            here is a matter of record only.
-          </remark>
-        </para>
-      </listitem>
+  <para>
+    The definition for character columns (for example,
+    <literal>TABLES.TABLE_NAME</literal>), is generally
+    <literal>VARCHAR(<replaceable>N</replaceable>) CHARACTER SET
+    utf8</literal> where <replaceable>N</replaceable> is at least 64.
+  </para>
 
-    </itemizedlist>
+  <para>
+    Each section indicates what <literal>SHOW</literal> statement is
+    equivalent to a <literal>SELECT</literal> that retrieves information
+    from <literal>INFORMATION_SCHEMA</literal>, or else that there is no
+    such equivalent statement.
+  </para>
 
-    <para>
-      To avoid using any name that is reserved in the standard or in
-      DB2, SQL Server, or Oracle, we changed the names of columns marked
-      <emphasis role="bold">MySQL extension</emphasis>. (For example, we
-      changed <literal>COLLATION</literal> to
-      <literal>TABLE_COLLATION</literal> in the
-      <literal>TABLES</literal> table.) See the list of reserved words
-      near the end of this article:
-      <ulink url="http://www.dbazine.com/gulutzan5.shtml"/>.
-    </para>
+  <para>
+    <emphasis role="bold">Note</emphasis>: At present, there are some
+    missing columns and some columns out of order. We are working on
+    this and intend to update the documentation as changes are made.
+  </para>
 
-    <para>
-      The definition for character columns (for example,
-      <literal>TABLES.TABLE_NAME</literal>), is generally
-      <literal>VARCHAR(<replaceable>N</replaceable>) CHARACTER SET
-      utf8</literal> where <replaceable>N</replaceable> is at least 64.
-    </para>
+  <section id="schemata-table">
 
-    <para>
-      Each section indicates what <literal>SHOW</literal> statement is
-      equivalent to a <literal>SELECT</literal> that retrieves
-      information from <literal>INFORMATION_SCHEMA</literal>, or else
-      that there is no such equivalent statement.
-    </para>
+    <title>&title-schemata-table;</title>
 
+    <indexterm type="function">
+      <primary>SCHEMATA</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
+
     <para>
-      <emphasis role="bold">Note</emphasis>: At present, there are some
-      missing columns and some columns out of order. We are working on
-      this and intend to update the documentation as changes are made.
+      A schema is a database, so the <literal>SCHEMATA</literal> table
+      provides information about databases.
     </para>
 
-    <section id="schemata-table">
-
-      <title>&title-schemata-table;</title>
-
-      <indexterm type="function">
-        <primary>SCHEMATA</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
-
-      <para>
-        A schema is a database, so the <literal>SCHEMATA</literal> table
-        provides information about databases.
-      </para>
-
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>CATALOG_NAME</literal></entry>
-              <entry>-</entry>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>SCHEMA_NAME</literal></entry>
-              <entry/>
-              <entry>Database</entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>CATALOG_NAME</literal></entry>
+            <entry>-</entry>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>SCHEMA_NAME</literal></entry>
+            <entry/>
+            <entry>Database</entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -363,51 +354,51 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>DEFAULT_CHARACTER_SET_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DEFAULT_COLLATION_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SQL_PATH</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>DEFAULT_CHARACTER_SET_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DEFAULT_COLLATION_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SQL_PATH</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            <emphasis role="bold">Note</emphasis>: The value of the
-            <literal>SQL_PATH</literal> column is always
-            <literal>NULL</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">Note</emphasis>: The value of the
+          <literal>SQL_PATH</literal> column is always
+          <literal>NULL</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>DEFAULT_COLLATION_NAME</literal> was added in MySQL
-            5.0.6.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>DEFAULT_COLLATION_NAME</literal> was added in MySQL
+          5.0.6.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT SCHEMA_NAME AS `Database
@@ -418,53 +409,53 @@
     [LIKE 'wild']
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="tables-table">
+  <section id="tables-table">
 
-      <title>&title-tables-table;</title>
+    <title>&title-tables-table;</title>
 
-      <indexterm type="function">
-        <primary>TABLES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>TABLES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>TABLES</literal> table provides information about
-        tables in databases.
-      </para>
+    <para>
+      The <literal>TABLES</literal> table provides information about
+      tables in databases.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry><literal>Table_</literal>...</entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry><literal>Table_</literal>...</entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry><literal>Table_</literal>...</entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry><literal>Table_</literal>...</entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -531,148 +522,148 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>ENGINE</literal></entry>
-              <entry><literal>Engine</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>VERSION</literal></entry>
-              <entry><literal>Version</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>ROW_FORMAT</literal></entry>
-              <entry><literal>Row_format</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_ROWS</literal></entry>
-              <entry><literal>Rows</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>AVG_ROW_LENGTH</literal></entry>
-              <entry><literal>Avg_row_length</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>DATA_LENGTH</literal></entry>
-              <entry><literal>Data_length</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>MAX_DATA_LENGTH</literal></entry>
-              <entry><literal>Max_data_length</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>INDEX_LENGTH</literal></entry>
-              <entry><literal>Index_length</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>DATA_FREE</literal></entry>
-              <entry><literal>Data_free</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>AUTO_INCREMENT</literal></entry>
-              <entry><literal>Auto_increment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>CREATE_TIME</literal></entry>
-              <entry><literal>Create_time</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>UPDATE_TIME</literal></entry>
-              <entry><literal>Update_time</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>CHECK_TIME</literal></entry>
-              <entry><literal>Check_time</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_COLLATION</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>CHECKSUM</literal></entry>
-              <entry><literal>Checksum</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>CREATE_OPTIONS</literal></entry>
-              <entry><literal>Create_options</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_COMMENT</literal></entry>
-              <entry><literal>Comment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>ENGINE</literal></entry>
+            <entry><literal>Engine</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>VERSION</literal></entry>
+            <entry><literal>Version</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>ROW_FORMAT</literal></entry>
+            <entry><literal>Row_format</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_ROWS</literal></entry>
+            <entry><literal>Rows</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>AVG_ROW_LENGTH</literal></entry>
+            <entry><literal>Avg_row_length</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>DATA_LENGTH</literal></entry>
+            <entry><literal>Data_length</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>MAX_DATA_LENGTH</literal></entry>
+            <entry><literal>Max_data_length</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>INDEX_LENGTH</literal></entry>
+            <entry><literal>Index_length</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>DATA_FREE</literal></entry>
+            <entry><literal>Data_free</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>AUTO_INCREMENT</literal></entry>
+            <entry><literal>Auto_increment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>CREATE_TIME</literal></entry>
+            <entry><literal>Create_time</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>UPDATE_TIME</literal></entry>
+            <entry><literal>Update_time</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>CHECK_TIME</literal></entry>
+            <entry><literal>Check_time</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_COLLATION</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>CHECKSUM</literal></entry>
+            <entry><literal>Checksum</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>CREATE_OPTIONS</literal></entry>
+            <entry><literal>Create_options</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_COMMENT</literal></entry>
+            <entry><literal>Comment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            <literal>TABLE_SCHEMA</literal> and
-            <literal>TABLE_NAME</literal> are a single field in a
-            <literal>SHOW</literal> display, for example
-            <literal>Table_in_db1</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>TABLE_SCHEMA</literal> and
+          <literal>TABLE_NAME</literal> are a single field in a
+          <literal>SHOW</literal> display, for example
+          <literal>Table_in_db1</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>TABLE_TYPE</literal> should be <literal>BASE
-            TABLE</literal> or <literal>VIEW</literal>. If table is
-            temporary, then <literal>TABLE_TYPE</literal> =
-            <literal>TEMPORARY</literal>. (There are no temporary views,
-            so this is not ambiguous.)
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>TABLE_TYPE</literal> should be <literal>BASE
+          TABLE</literal> or <literal>VIEW</literal>. If table is
+          temporary, then <literal>TABLE_TYPE</literal> =
+          <literal>TEMPORARY</literal>. (There are no temporary views,
+          so this is not ambiguous.)
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>TABLE_ROWS</literal> column is
-            <literal>NULL</literal> if the table is in the
-            <literal>INFORMATION_SCHEMA</literal> database. For
-            <literal>InnoDB</literal> tables, the row count is only a
-            rough estimate used in SQL optimization.
-          </para>
+      <listitem>
+        <para>
+          The <literal>TABLE_ROWS</literal> column is
+          <literal>NULL</literal> if the table is in the
+          <literal>INFORMATION_SCHEMA</literal> database. For
+          <literal>InnoDB</literal> tables, the row count is only a
+          rough estimate used in SQL optimization.
+        </para>
 
-          <remark role="todo">
-            TEMPORARY tables are missing at the moment; perhaps because
-            they don't appear in the output of SHOW TABLES, either?
-          </remark>
-        </listitem>
+        <remark role="todo">
+          TEMPORARY tables are missing at the moment; perhaps because
+          they don't appear in the output of SHOW TABLES, either?
+        </remark>
+      </listitem>
 
-        <listitem>
-          <para>
-            We have nothing for the table's default character set.
-            <literal>TABLE_COLLATION</literal> is close, because
-            collation names begin with a character set name.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          We have nothing for the table's default character set.
+          <literal>TABLE_COLLATION</literal> is close, because collation
+          names begin with a character set name.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT table_name FROM INFORMATION_SCHEMA.TABLES
@@ -684,88 +675,88 @@
   [LIKE 'wild']
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="columns-table">
+  <section id="columns-table">
 
-      <title>&title-columns-table;</title>
+    <title>&title-columns-table;</title>
 
-      <indexterm type="function">
-        <primary>COLUMNS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>COLUMNS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>COLUMNS</literal> table provides information about
-        columns in tables.
-      </para>
+    <para>
+      The <literal>COLUMNS</literal> table provides information about
+      columns in tables.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLUMN_NAME</literal></entry>
-              <entry><literal>Field</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ORDINAL_POSITION</literal></entry>
-              <entry/>
-              <entry>see notes</entry>
-            </row>
-            <row>
-              <entry><literal>COLUMN_DEFAULT</literal></entry>
-              <entry><literal>Default</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_NULLABLE</literal></entry>
-              <entry><literal>Null</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DATA_TYPE</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CHARACTER_MAXIMUM_LENGTH</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CHARACTER_OCTET_LENGTH</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>NUMERIC_PRECISION</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry/>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLUMN_NAME</literal></entry>
+            <entry><literal>Field</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ORDINAL_POSITION</literal></entry>
+            <entry/>
+            <entry>see notes</entry>
+          </row>
+          <row>
+            <entry><literal>COLUMN_DEFAULT</literal></entry>
+            <entry><literal>Default</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_NULLABLE</literal></entry>
+            <entry><literal>Null</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DATA_TYPE</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CHARACTER_MAXIMUM_LENGTH</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CHARACTER_OCTET_LENGTH</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>NUMERIC_PRECISION</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -777,11 +768,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>NUMERIC_SCALE</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>NUMERIC_SCALE</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -837,11 +828,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>CHARACTER_SET_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>CHARACTER_SET_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -864,11 +855,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>COLLATION_NAME</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>COLLATION_NAME</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1078,78 +1069,77 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>COLUMN_TYPE</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>COLUMN_KEY</literal></entry>
-              <entry><literal>Key</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>EXTRA</literal></entry>
-              <entry><literal>Extra</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>COLUMN_COMMENT</literal></entry>
-              <entry><literal>Comment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>COLUMN_TYPE</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>COLUMN_KEY</literal></entry>
+            <entry><literal>Key</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>EXTRA</literal></entry>
+            <entry><literal>Extra</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>COLUMN_COMMENT</literal></entry>
+            <entry><literal>Comment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            In <literal>SHOW</literal>, the <literal>Type</literal>
-            display includes values from several different
-            <literal>COLUMNS</literal> columns.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          In <literal>SHOW</literal>, the <literal>Type</literal>
+          display includes values from several different
+          <literal>COLUMNS</literal> columns.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>ORDINAL_POSITION</literal> is necessary because you
-            might someday want to say <literal>ORDER BY
-            ORDINAL_POSITION</literal>. Unlike <literal>SHOW</literal>,
-            <literal>SELECT</literal> does not have automatic ordering.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>ORDINAL_POSITION</literal> is necessary because you
+          might someday want to say <literal>ORDER BY
+          ORDINAL_POSITION</literal>. Unlike <literal>SHOW</literal>,
+          <literal>SELECT</literal> does not have automatic ordering.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>CHARACTER_OCTET_LENGTH</literal> should be the same
-            as <literal>CHARACTER_MAXIMUM_LENGTH</literal>, except for
-            multi-byte character sets.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>CHARACTER_OCTET_LENGTH</literal> should be the same
+          as <literal>CHARACTER_MAXIMUM_LENGTH</literal>, except for
+          multi-byte character sets.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>CHARACTER_SET_NAME</literal> can be derived from
-            <literal>Collation</literal>. For example, if you say
-            <literal>SHOW FULL COLUMNS FROM t</literal>, and you see in
-            the <literal>Collation</literal> column a value of
-            <literal>latin1_swedish_ci</literal>, the character set is
-            what's before the first underscore:
-            <literal>latin1</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>CHARACTER_SET_NAME</literal> can be derived from
+          <literal>Collation</literal>. For example, if you say
+          <literal>SHOW FULL COLUMNS FROM t</literal>, and you see in
+          the <literal>Collation</literal> column a value of
+          <literal>latin1_swedish_ci</literal>, the character set is
+          what's before the first underscore: <literal>latin1</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are nearly equivalent:
-      </para>
+    <para>
+      The following statements are nearly equivalent:
+    </para>
 
 <programlisting>
 SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT
@@ -1164,63 +1154,63 @@
   [LIKE wild]
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="statistics-table">
+  <section id="statistics-table">
 
-      <title>&title-statistics-table;</title>
+    <title>&title-statistics-table;</title>
 
-      <indexterm type="function">
-        <primary>STATISTICS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>STATISTICS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>STATISTICS</literal> table provides information
-        about table indexes.
-      </para>
+    <para>
+      The <literal>STATISTICS</literal> table provides information about
+      table indexes.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry>= Database</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry><literal>Table</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>NON_UNIQUE</literal></entry>
-              <entry><literal>Non_unique</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>INDEX_SCHEMA</literal></entry>
-              <entry/>
-              <entry>= Database</entry>
-            </row>
-            <row>
-              <entry><literal>INDEX_NAME</literal></entry>
-              <entry><literal>Key_name</literal></entry>
-              <entry/>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry>= Database</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry><literal>Table</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>NON_UNIQUE</literal></entry>
+            <entry><literal>Non_unique</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>INDEX_SCHEMA</literal></entry>
+            <entry/>
+            <entry>= Database</entry>
+          </row>
+          <row>
+            <entry><literal>INDEX_NAME</literal></entry>
+            <entry><literal>Key_name</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1232,26 +1222,26 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SEQ_IN_INDEX</literal></entry>
-              <entry><literal>Seq_in_index</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLUMN_NAME</literal></entry>
-              <entry><literal>Column_name</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLLATION</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CARDINALITY</literal></entry>
-              <entry><literal>Cardinality</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>SEQ_IN_INDEX</literal></entry>
+            <entry><literal>Seq_in_index</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLUMN_NAME</literal></entry>
+            <entry><literal>Column_name</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLLATION</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CARDINALITY</literal></entry>
+            <entry><literal>Cardinality</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1274,63 +1264,63 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SUB_PART</literal></entry>
-              <entry><literal>Sub_part</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>PACKED</literal></entry>
-              <entry><literal>Packed</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>NULLABLE</literal></entry>
-              <entry><literal>Null</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>INDEX_TYPE</literal></entry>
-              <entry><literal>Index_type</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>COMMENT</literal></entry>
-              <entry><literal>Comment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>SUB_PART</literal></entry>
+            <entry><literal>Sub_part</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>PACKED</literal></entry>
+            <entry><literal>Packed</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>NULLABLE</literal></entry>
+            <entry><literal>Null</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>INDEX_TYPE</literal></entry>
+            <entry><literal>Index_type</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>COMMENT</literal></entry>
+            <entry><literal>Comment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            There is no standard table for indexes. The preceding list
-            is similar to what SQL Server 2000 returns for
-            <literal>sp_statistics</literal>, except that we replaced
-            the name <literal>QUALIFIER</literal> with
-            <literal>CATALOG</literal> and we replaced the name
-            <literal>OWNER</literal> with <literal>SCHEMA</literal>.
-          </para>
+      <listitem>
+        <para>
+          There is no standard table for indexes. The preceding list is
+          similar to what SQL Server 2000 returns for
+          <literal>sp_statistics</literal>, except that we replaced the
+          name <literal>QUALIFIER</literal> with
+          <literal>CATALOG</literal> and we replaced the name
+          <literal>OWNER</literal> with <literal>SCHEMA</literal>.
+        </para>
 
-          <para>
-            Clearly, the preceding table and the output from
-            <literal>SHOW INDEX</literal> are derived from the same
-            parent. So the correlation is already close.
-          </para>
-        </listitem>
+        <para>
+          Clearly, the preceding table and the output from <literal>SHOW
+          INDEX</literal> are derived from the same parent. So the
+          correlation is already close.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT * FROM INFORMATION_SCHEMA.STATISTICS
@@ -1342,173 +1332,173 @@
   [FROM db_name]
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="user-privileges-table">
+  <section id="user-privileges-table">
 
-      <title>&title-user-privileges-table;</title>
+    <title>&title-user-privileges-table;</title>
 
-      <indexterm type="function">
-        <primary>USER_PRIVILEGES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>USER_PRIVILEGES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>USER_PRIVILEGES</literal> table provides
-        information about global privileges. This information comes from
-        the <literal>mysql.user</literal> grant table.
-      </para>
+    <para>
+      The <literal>USER_PRIVILEGES</literal> table provides information
+      about global privileges. This information comes from the
+      <literal>mysql.user</literal> grant table.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>GRANTEE</literal></entry>
-              <entry/>
-              <entry>e.g. 'user'@'host'</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>PRIVILEGE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_GRANTABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>GRANTEE</literal></entry>
+            <entry/>
+            <entry>e.g. 'user'@'host'</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>PRIVILEGE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_GRANTABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            This is a non-standard table. It takes its values from the
-            <literal>mysql.user</literal> table.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          This is a non-standard table. It takes its values from the
+          <literal>mysql.user</literal> table.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="schema-privileges-table">
+  <section id="schema-privileges-table">
 
-      <title>&title-schema-privileges-table;</title>
+    <title>&title-schema-privileges-table;</title>
 
-      <indexterm type="function">
-        <primary>SCHEMA_PRIVILEGES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>SCHEMA_PRIVILEGES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>SCHEMA_PRIVILEGES</literal> table provides
-        information about schema (database) privileges. This information
-        comes from the <literal>mysql.db</literal> grant table.
-      </para>
+    <para>
+      The <literal>SCHEMA_PRIVILEGES</literal> table provides
+      information about schema (database) privileges. This information
+      comes from the <literal>mysql.db</literal> grant table.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>GRANTEE</literal></entry>
-              <entry/>
-              <entry>e.g. 'user'@'host'</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PRIVILEGE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_GRANTABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>GRANTEE</literal></entry>
+            <entry/>
+            <entry>e.g. 'user'@'host'</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PRIVILEGE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_GRANTABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            This is a non-standard table. It takes its values from the
-            <literal>mysql.db</literal> table.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          This is a non-standard table. It takes its values from the
+          <literal>mysql.db</literal> table.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="table-privileges-table">
+  <section id="table-privileges-table">
 
-      <title>&title-table-privileges-table;</title>
+    <title>&title-table-privileges-table;</title>
 
-      <indexterm type="function">
-        <primary>TABLE_PRIVILEGES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>TABLE_PRIVILEGES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>TABLE_PRIVILEGES</literal> table provides
-        information about table privileges. This information comes from
-        the <literal>mysql.tables_priv</literal> grant table.
-      </para>
+    <para>
+      The <literal>TABLE_PRIVILEGES</literal> table provides information
+      about table privileges. This information comes from the
+      <literal>mysql.tables_priv</literal> grant table.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -1520,36 +1510,36 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>GRANTEE</literal></entry>
-              <entry/>
-              <entry>e.g. 'user'@'host'</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PRIVILEGE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_GRANTABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>GRANTEE</literal></entry>
+            <entry/>
+            <entry>e.g. 'user'@'host'</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PRIVILEGE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_GRANTABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1561,14 +1551,13 @@
            </entry>
          </row>
          -->
-          </tbody>
-        </tgroup>
-      </informaltable>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        The following statements are <emphasis>not</emphasis>
-        equivalent:
-      </para>
+    <para>
+      The following statements are <emphasis>not</emphasis> equivalent:
+    </para>
 
 <programlisting>
 SELECT ... FROM INFORMATION_SCHEMA.TABLE_PRIVILEGES
@@ -1576,43 +1565,43 @@
 SHOW GRANTS ...
 </programlisting>
 
-      <para>
-        <literal>PRIVILEGE_TYPE</literal> can contain one (and only one)
-        of these values: <literal>SELECT</literal>,
-        <literal>INSERT</literal>, <literal>UPDATE</literal>,
-        <literal>REFERENCES</literal>, <literal>ALTER</literal>,
-        <literal>INDEX</literal>, <literal>DROP</literal>,
-        <literal>CREATE VIEW</literal>.
-      </para>
+    <para>
+      <literal>PRIVILEGE_TYPE</literal> can contain one (and only one)
+      of these values: <literal>SELECT</literal>,
+      <literal>INSERT</literal>, <literal>UPDATE</literal>,
+      <literal>REFERENCES</literal>, <literal>ALTER</literal>,
+      <literal>INDEX</literal>, <literal>DROP</literal>, <literal>CREATE
+      VIEW</literal>.
+    </para>
 
-    </section>
+  </section>
 
-    <section id="column-privileges-table">
+  <section id="column-privileges-table">
 
-      <title>&title-column-privileges-table;</title>
+    <title>&title-column-privileges-table;</title>
 
-      <indexterm type="function">
-        <primary>COLUMN_PRIVILEGES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>COLUMN_PRIVILEGES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>COLUMN_PRIVILEGES</literal> table provides
-        information about column privileges. This information comes from
-        the <literal>mysql.columns_priv</literal> grant table.
-      </para>
+    <para>
+      The <literal>COLUMN_PRIVILEGES</literal> table provides
+      information about column privileges. This information comes from
+      the <literal>mysql.columns_priv</literal> grant table.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -1624,87 +1613,86 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>GRANTEE</literal></entry>
-              <entry/>
-              <entry>e.g. 'user'@'host'</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLUMN_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PRIVILEGE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_GRANTABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>GRANTEE</literal></entry>
+            <entry/>
+            <entry>e.g. 'user'@'host'</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLUMN_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PRIVILEGE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_GRANTABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            In the output from <literal>SHOW FULL COLUMNS</literal>, the
-            privileges are all in one field and in lowercase, for
-            example, <literal>select,insert,update,references</literal>.
-            In <literal>COLUMN_PRIVILEGES</literal>, there is one row
-            per privilege, and it's uppercase.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          In the output from <literal>SHOW FULL COLUMNS</literal>, the
+          privileges are all in one field and in lowercase, for example,
+          <literal>select,insert,update,references</literal>. In
+          <literal>COLUMN_PRIVILEGES</literal>, there is one row per
+          privilege, and it's uppercase.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>PRIVILEGE_TYPE</literal> can contain one (and only
-            one) of these values: <literal>SELECT</literal>,
-            <literal>INSERT</literal>, <literal>UPDATE</literal>,
-            <literal>REFERENCES</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>PRIVILEGE_TYPE</literal> can contain one (and only
+          one) of these values: <literal>SELECT</literal>,
+          <literal>INSERT</literal>, <literal>UPDATE</literal>,
+          <literal>REFERENCES</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            If the user has <literal>GRANT OPTION</literal> privilege,
-            <literal>IS_GRANTABLE</literal> should be
-            <literal>YES</literal>. Otherwise,
-            <literal>IS_GRANTABLE</literal> should be
-            <literal>NO</literal>. The output does not list
-            <literal>GRANT OPTION</literal> as a separate privilege.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          If the user has <literal>GRANT OPTION</literal> privilege,
+          <literal>IS_GRANTABLE</literal> should be
+          <literal>YES</literal>. Otherwise,
+          <literal>IS_GRANTABLE</literal> should be
+          <literal>NO</literal>. The output does not list <literal>GRANT
+          OPTION</literal> as a separate privilege.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are <emphasis>not</emphasis>
-        equivalent:
-      </para>
+    <para>
+      The following statements are <emphasis>not</emphasis> equivalent:
+    </para>
 
 <programlisting>
 SELECT ... FROM INFORMATION_SCHEMA.COLUMN_PRIVILEGES
@@ -1712,33 +1700,33 @@
 SHOW GRANTS ...
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="character-sets-table">
+  <section id="character-sets-table">
 
-      <title>&title-character-sets-table;</title>
+    <title>&title-character-sets-table;</title>
 
-      <indexterm type="function">
-        <primary>CHARACTER_SETS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>CHARACTER_SETS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>CHARACTER_SETS</literal> table provides information
-        about available character sets.
-      </para>
+    <para>
+      The <literal>CHARACTER_SETS</literal> table provides information
+      about available character sets.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -1761,11 +1749,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>CHARACTER_SET_NAME</literal></entry>
-              <entry><literal>Charset</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>CHARACTER_SET_NAME</literal></entry>
+            <entry><literal>Charset</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1821,45 +1809,45 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>DEFAULT_COLLATE_NAME</literal></entry>
-              <entry><literal>Default collation</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DESCRIPION</literal></entry>
-              <entry><literal>Description</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>MAXLEN</literal></entry>
-              <entry><literal>Maxlen</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>DEFAULT_COLLATE_NAME</literal></entry>
+            <entry><literal>Default collation</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DESCRIPION</literal></entry>
+            <entry><literal>Description</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>MAXLEN</literal></entry>
+            <entry><literal>Maxlen</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            We have added two non-standard columns corresponding to the
-            <literal>Description</literal> and <literal>Maxlen</literal>
-            columns in the output from <literal>SHOW CHARACTER
-            SET</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          We have added two non-standard columns corresponding to the
+          <literal>Description</literal> and <literal>Maxlen</literal>
+          columns in the output from <literal>SHOW CHARACTER
+          SET</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT * FROM INFORMATION_SCHEMA.CHARACTER_SETS
@@ -1869,33 +1857,33 @@
   [LIKE 'wild']
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="collations-table">
+  <section id="collations-table">
 
-      <title>&title-collations-table;</title>
+    <title>&title-collations-table;</title>
 
-      <indexterm type="function">
-        <primary>COLLATIONS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>COLLATIONS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>COLLATIONS</literal> table provides information
-        about collations for each character set.
-      </para>
+    <para>
+      The <literal>COLLATIONS</literal> table provides information about
+      collations for each character set.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -1918,11 +1906,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>COLLATION_NAME</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>COLLATION_NAME</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2022,31 +2010,31 @@
            </entry>
          </row>
          -->
-          </tbody>
-        </tgroup>
-      </informaltable>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            We have added five non-standard columns corresponding to the
-            <literal>Charset</literal>, <literal>Id</literal>,
-            <literal>Default</literal>, <literal>Compiled</literal>, and
-            <literal>Sortlen</literal> columns in the output from
-            <literal>SHOW COLLATION</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          We have added five non-standard columns corresponding to the
+          <literal>Charset</literal>, <literal>Id</literal>,
+          <literal>Default</literal>, <literal>Compiled</literal>, and
+          <literal>Sortlen</literal> columns in the output from
+          <literal>SHOW COLLATION</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS
@@ -2056,35 +2044,35 @@
   [LIKE 'wild']
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="collation-character-set-applicability-table">
+  <section id="collation-character-set-applicability-table">
 
-      <title>&title-collation-character-set-applicability-table;</title>
+    <title>&title-collation-character-set-applicability-table;</title>
 
-      <indexterm type="function">
-        <primary>COLLATION_CHARACTER_SET_APPLICABILITY</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>COLLATION_CHARACTER_SET_APPLICABILITY</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>COLLATION_CHARACTER_SET_APPLICABILITY</literal>
-        table indicates what character set is applicable for what
-        collation. The columns are equivalent to the first two display
-        fields that we get from <literal>SHOW COLLATION</literal>.
-      </para>
+    <para>
+      The <literal>COLLATION_CHARACTER_SET_APPLICABILITY</literal> table
+      indicates what character set is applicable for what collation. The
+      columns are equivalent to the first two display fields that we get
+      from <literal>SHOW COLLATION</literal>.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -2107,11 +2095,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>COLLATION_NAME</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>COLLATION_NAME</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2134,57 +2122,57 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>CHARACTER_SET_NAME</literal></entry>
-              <entry><literal>Charset</literal></entry>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>CHARACTER_SET_NAME</literal></entry>
+            <entry><literal>Charset</literal></entry>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-    </section>
+  </section>
 
-    <section id="table-constraints-table">
+  <section id="table-constraints-table">
 
-      <title>&title-table-constraints-table;</title>
+    <title>&title-table-constraints-table;</title>
 
-      <indexterm type="function">
-        <primary>CONSTRAINTS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>CONSTRAINTS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>TABLE_CONSTRAINTS</literal> table describes which
-        tables have constraints.
-      </para>
+    <para>
+      The <literal>TABLE_CONSTRAINTS</literal> table describes which
+      tables have constraints.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2196,21 +2184,21 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2233,176 +2221,175 @@
            </entry>
          </row>
          -->
-          </tbody>
-        </tgroup>
-      </informaltable>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            The <literal>CONSTRAINT_TYPE</literal> value can be
-            <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>,
-            or <literal>FOREIGN KEY</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>CONSTRAINT_TYPE</literal> value can be
+          <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, or
+          <literal>FOREIGN KEY</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>UNIQUE</literal> and <literal>PRIMARY
-            KEY</literal> information is about the same as what you get
-            from the <literal>Key_name</literal> field in the output
-            from <literal>SHOW INDEX</literal> when the
-            <literal>Non_unique</literal> field is <literal>0</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>UNIQUE</literal> and <literal>PRIMARY
+          KEY</literal> information is about the same as what you get
+          from the <literal>Key_name</literal> field in the output from
+          <literal>SHOW INDEX</literal> when the
+          <literal>Non_unique</literal> field is <literal>0</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>CONSTRAINT_TYPE</literal> column can contain
-            one of these values: <literal>UNIQUE</literal>,
-            <literal>PRIMARY KEY</literal>, <literal>FOREIGN
-            KEY</literal>, <literal>CHECK</literal>. This is a
-            <literal>CHAR</literal> (not <literal>ENUM</literal>)
-            column. The <literal>CHECK</literal> value is not available
-            until we support <literal>CHECK</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>CONSTRAINT_TYPE</literal> column can contain one
+          of these values: <literal>UNIQUE</literal>, <literal>PRIMARY
+          KEY</literal>, <literal>FOREIGN KEY</literal>,
+          <literal>CHECK</literal>. This is a <literal>CHAR</literal>
+          (not <literal>ENUM</literal>) column. The
+          <literal>CHECK</literal> value is not available until we
+          support <literal>CHECK</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="key-column-usage-table">
+  <section id="key-column-usage-table">
 
-      <title>&title-key-column-usage-table;</title>
+    <title>&title-key-column-usage-table;</title>
 
-      <indexterm type="function">
-        <primary>KEY_COLUMN_USAGE</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>KEY_COLUMN_USAGE</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>KEY_COLUMN_USAGE</literal> table describes which
-        key columns have constraints.
-      </para>
+    <para>
+      The <literal>KEY_COLUMN_USAGE</literal> table describes which key
+      columns have constraints.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLUMN_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ORDINAL_POSITION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>POSITION_IN_UNIQUE_CONSTRAINT</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>REFERENCED_TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>REFERENCED_TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>REFERENCED_COLUMN_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLUMN_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ORDINAL_POSITION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>POSITION_IN_UNIQUE_CONSTRAINT</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>REFERENCED_TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>REFERENCED_TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>REFERENCED_COLUMN_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            If the constraint is a foreign key, then this is the column
-            of the foreign key, not the column that the foreign key
-            references.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          If the constraint is a foreign key, then this is the column of
+          the foreign key, not the column that the foreign key
+          references.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The value of <literal>ORDINAL_POSITION</literal> is the
-            column's position within the constraint, not the column's
-            position within the table. Column positions are numbered
-            beginning with 1.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The value of <literal>ORDINAL_POSITION</literal> is the
+          column's position within the constraint, not the column's
+          position within the table. Column positions are numbered
+          beginning with 1.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The value of
-            <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal> is
-            <literal>NULL</literal> for unique and primary-key
-            constraints. For foreign-key constraints, it is the ordinal
-            position in key of the table that is being referenced.
-          </para>
+      <listitem>
+        <para>
+          The value of <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>
+          is <literal>NULL</literal> for unique and primary-key
+          constraints. For foreign-key constraints, it is the ordinal
+          position in key of the table that is being referenced.
+        </para>
 
-          <para>
-            For example, suppose that there are two tables name
-            <literal>t1</literal> and <literal>t3</literal> that have
-            the following definitions:
-          </para>
+        <para>
+          For example, suppose that there are two tables name
+          <literal>t1</literal> and <literal>t3</literal> that have the
+          following definitions:
+        </para>
 
 <programlisting>
 CREATE TABLE t1
@@ -2423,85 +2410,83 @@
 ) ENGINE=InnoDB;
 </programlisting>
 
-          <para>
-            For those two tables, the
-            <literal>KEY_COLUMN_USAGE</literal> table has two rows:
-          </para>
+        <para>
+          For those two tables, the <literal>KEY_COLUMN_USAGE</literal>
+          table has two rows:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                One row with
-                <literal>CONSTRAINT_NAME</literal>='PRIMARY',
-                <literal>TABLE_NAME</literal>='t1',
-                <literal>COLUMN_NAME</literal>='s3',
-                <literal>ORDINAL_POSITION</literal>=1,
-                <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>=NULL.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              One row with <literal>CONSTRAINT_NAME</literal>='PRIMARY',
+              <literal>TABLE_NAME</literal>='t1',
+              <literal>COLUMN_NAME</literal>='s3',
+              <literal>ORDINAL_POSITION</literal>=1,
+              <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>=NULL.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                One row with <literal>CONSTRAINT_NAME</literal>='CO',
-                <literal>TABLE_NAME</literal>='t3',
-                <literal>COLUMN_NAME</literal>='s2',
-                <literal>ORDINAL_POSITION</literal>=1,
-                <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>=1.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              One row with <literal>CONSTRAINT_NAME</literal>='CO',
+              <literal>TABLE_NAME</literal>='t3',
+              <literal>COLUMN_NAME</literal>='s2',
+              <literal>ORDINAL_POSITION</literal>=1,
+              <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>=1.
+            </para>
+          </listitem>
 
-          </itemizedlist>
-        </listitem>
+        </itemizedlist>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>REFERENCED_TABLE_SCHEMA</literal>,
-            <literal>REFERENCED_TABLE_NAME</literal>, and
-            <literal>REFERENCED_COLUMN_NAME</literal> were added in
-            MySQL 5.0.6.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>REFERENCED_TABLE_SCHEMA</literal>,
+          <literal>REFERENCED_TABLE_NAME</literal>, and
+          <literal>REFERENCED_COLUMN_NAME</literal> were added in MySQL
+          5.0.6.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="routines-table">
+  <section id="routines-table">
 
-      <title>&title-routines-table;</title>
+    <title>&title-routines-table;</title>
 
-      <indexterm type="function">
-        <primary>ROUTINES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>ROUTINES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>ROUTINES</literal> table provides information about
-        stored routines (both procedures and functions). The
-        <literal>ROUTINES</literal> table does not include user-defined
-        functions (UDFs) at this time.
-      </para>
+    <para>
+      The <literal>ROUTINES</literal> table provides information about
+      stored routines (both procedures and functions). The
+      <literal>ROUTINES</literal> table does not include user-defined
+      functions (UDFs) at this time.
+    </para>
 
-      <para>
-        The column named <quote><literal>mysql.proc</literal>
-        name</quote> indicates the <literal>mysql.proc</literal> table
-        column that corresponds to the
-        <literal>INFORMATION_SCHEMA.ROUTINES</literal> table column, if
-        any.
-      </para>
+    <para>
+      The column named <quote><literal>mysql.proc</literal> name</quote>
+      indicates the <literal>mysql.proc</literal> table column that
+      corresponds to the <literal>INFORMATION_SCHEMA.ROUTINES</literal>
+      table column, if any.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>mysql.proc</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>mysql.proc</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -2526,26 +2511,26 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SPECIFIC_NAME</literal></entry>
-              <entry><literal>specific_name</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_SCHEMA</literal></entry>
-              <entry><literal>db</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_NAME</literal></entry>
-              <entry><literal>name</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>SPECIFIC_NAME</literal></entry>
+            <entry><literal>specific_name</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_SCHEMA</literal></entry>
+            <entry><literal>db</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_NAME</literal></entry>
+            <entry><literal>name</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2612,51 +2597,51 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>ROUTINE_TYPE</literal></entry>
-              <entry><literal>type</literal></entry>
-              <entry><literal>{PROCEDURE|FUNCTION}</literal></entry>
-            </row>
-            <row>
-              <entry><literal>DTD_IDENTIFIER</literal></entry>
-              <entry/>
-              <entry>(data type descriptor)</entry>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_BODY</literal></entry>
-              <entry/>
-              <entry><literal>SQL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_DEFINITION</literal></entry>
-              <entry><literal>body</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>EXTERNAL_NAME</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>EXTERNAL_LANGUAGE</literal></entry>
-              <entry><literal>language</literal></entry>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>PARAMETER_STYLE</literal></entry>
-              <entry/>
-              <entry><literal>SQL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>IS_DETERMINISTIC</literal></entry>
-              <entry><literal>is_deterministic</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SQL_DATA_ACCESS</literal></entry>
-              <entry><literal>sql_data_access</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>ROUTINE_TYPE</literal></entry>
+            <entry><literal>type</literal></entry>
+            <entry><literal>{PROCEDURE|FUNCTION}</literal></entry>
+          </row>
+          <row>
+            <entry><literal>DTD_IDENTIFIER</literal></entry>
+            <entry/>
+            <entry>(data type descriptor)</entry>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_BODY</literal></entry>
+            <entry/>
+            <entry><literal>SQL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_DEFINITION</literal></entry>
+            <entry><literal>body</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>EXTERNAL_NAME</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>EXTERNAL_LANGUAGE</literal></entry>
+            <entry><literal>language</literal></entry>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>PARAMETER_STYLE</literal></entry>
+            <entry/>
+            <entry><literal>SQL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>IS_DETERMINISTIC</literal></entry>
+            <entry><literal>is_deterministic</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SQL_DATA_ACCESS</literal></entry>
+            <entry><literal>sql_data_access</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2668,11 +2653,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SQL_PATH</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
+          <row>
+            <entry><literal>SQL_PATH</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -2717,11 +2702,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SECURITY_TYPE</literal></entry>
-              <entry><literal>security_type</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>SECURITY_TYPE</literal></entry>
+            <entry><literal>security_type</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2766,16 +2751,16 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>CREATED</literal></entry>
-              <entry><literal>created</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>LAST_ALTERED</literal></entry>
-              <entry><literal>modified</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>CREATED</literal></entry>
+            <entry><literal>created</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>LAST_ALTERED</literal></entry>
+            <entry><literal>modified</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2820,127 +2805,127 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SQL_MODE</literal></entry>
-              <entry><literal>sql_mode</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_COMMENT</literal></entry>
-              <entry><literal>comment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>DEFINER</literal></entry>
-              <entry><literal>definer</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>SQL_MODE</literal></entry>
+            <entry><literal>sql_mode</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_COMMENT</literal></entry>
+            <entry><literal>comment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>DEFINER</literal></entry>
+            <entry><literal>definer</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            MySQL calculates <literal>EXTERNAL_LANGUAGE</literal> thus:
-          </para>
+      <listitem>
+        <para>
+          MySQL calculates <literal>EXTERNAL_LANGUAGE</literal> thus:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                If <literal>mysql.proc.language='SQL'</literal>, then
-                <literal>EXTERNAL_LANGUAGE</literal> is
-                <literal>NULL</literal>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              If <literal>mysql.proc.language='SQL'</literal>, then
+              <literal>EXTERNAL_LANGUAGE</literal> is
+              <literal>NULL</literal>
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Otherwise, <literal>EXTERNAL_LANGUAGE</literal> is
-                what's in <literal>mysql.proc.language</literal>.
-                However, we don't have external languages yet, so it's
-                always <literal>NULL</literal>.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              Otherwise, <literal>EXTERNAL_LANGUAGE</literal> is what's
+              in <literal>mysql.proc.language</literal>. However, we
+              don't have external languages yet, so it's always
+              <literal>NULL</literal>.
+            </para>
+          </listitem>
 
-          </itemizedlist>
-        </listitem>
+        </itemizedlist>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="views-table">
+  <section id="views-table">
 
-      <title>&title-views-table;</title>
+    <title>&title-views-table;</title>
 
-      <indexterm type="function">
-        <primary>VIEWS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>VIEWS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>VIEWS</literal> table provides information about
-        views in databases.
-      </para>
+    <para>
+      The <literal>VIEWS</literal> table provides information about
+      views in databases.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>VIEW_DEFINITION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CHECK_OPTION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_UPDATABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DEFINER</literal></entry>
-              <entry/>
-              <entry></entry>
-            </row>
-            <row>
-              <entry><literal>SECURITY_TYPE</literal></entry>
-              <entry/>
-              <entry></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>VIEW_DEFINITION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CHECK_OPTION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_UPDATABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DEFINER</literal></entry>
+            <entry/>
+            <entry></entry>
+          </row>
+          <row>
+            <entry><literal>SECURITY_TYPE</literal></entry>
+            <entry/>
+            <entry></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -2952,33 +2937,33 @@
            </entry>
          </row>
          -->
-          </tbody>
-        </tgroup>
-      </informaltable>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            There is a new privilege, <literal>SHOW VIEW</literal>,
-            without which you cannot see the <literal>VIEWS</literal>
-            table.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          There is a new privilege, <literal>SHOW VIEW</literal>,
+          without which you cannot see the <literal>VIEWS</literal>
+          table.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>VIEW_DEFINITION</literal> column has most of
-            what you see in the <literal>Create Table</literal> field
-            that <literal>SHOW CREATE VIEW</literal> produces. Skip the
-            words before <literal>SELECT</literal> and skip the words
-            <literal>WITH CHECK OPTION</literal>. For example, if the
-            original statement was:
-          </para>
+      <listitem>
+        <para>
+          The <literal>VIEW_DEFINITION</literal> column has most of what
+          you see in the <literal>Create Table</literal> field that
+          <literal>SHOW CREATE VIEW</literal> produces. Skip the words
+          before <literal>SELECT</literal> and skip the words
+          <literal>WITH CHECK OPTION</literal>. For example, if the
+          original statement was:
+        </para>
 
 <programlisting>
 CREATE VIEW v AS
@@ -2988,321 +2973,321 @@
   WITH CHECK OPTION;
 </programlisting>
 
-          <para>
-            then the view definition is:
-          </para>
+        <para>
+          then the view definition is:
+        </para>
 
 <programlisting>
 SELECT s2,s1 FROM t WHERE s1 &gt; 5 ORDER BY s1
 </programlisting>
-        </listitem>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>CHECK_OPTION</literal> column always has a
-            value of <literal>NONE</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>CHECK_OPTION</literal> column always has a value
+          of <literal>NONE</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>IS_UPDATABLE</literal> column is
-            <literal>YES</literal> if the view is updatable,
-            <literal>NO</literal> if the view is not updatable.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>IS_UPDATABLE</literal> column is
+          <literal>YES</literal> if the view is updatable,
+          <literal>NO</literal> if the view is not updatable.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>DEFINER</literal> and
-            <literal>SECURITY_TYPE</literal> columns were added in MySQL
-            5.0.14. <literal>DEFINER</literal> indicates who defined the
-            view. <literal>SECURITY_TYPE</literal> has a value of
-            <literal>DEFINER</literal> or <literal>INVOKER</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>DEFINER</literal> and
+          <literal>SECURITY_TYPE</literal> columns were added in MySQL
+          5.0.14. <literal>DEFINER</literal> indicates who defined the
+          view. <literal>SECURITY_TYPE</literal> has a value of
+          <literal>DEFINER</literal> or <literal>INVOKER</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="triggers-table">
+  <section id="triggers-table">
 
-      <title>&title-triggers-table;</title>
+    <title>&title-triggers-table;</title>
 
-      <indexterm type="function">
-        <primary>TRIGGERS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>TRIGGERS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>TRIGGERS</literal> table provides information about
-        triggers.
-      </para>
+    <para>
+      The <literal>TRIGGERS</literal> table provides information about
+      triggers.
+    </para>
 
-      <para>
-        This table was first implemented in MySQL 5.0.10.
-      </para>
+    <para>
+      This table was first implemented in MySQL 5.0.10.
+    </para>
 
-      <para>
-        You must have the <literal>SUPER</literal> privilege to view
-        this table.
-      </para>
+    <para>
+      You must have the <literal>SUPER</literal> privilege to view this
+      table.
+    </para>
 
-      <remark role="note">
-        Table schema as suggested by
-        http://lists.mysql.com/internals/25556: "TRIGGER_CATALOG",
-        NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0 "TRIGGER_SCHEMA", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 0, 0 "TRIGGER_NAME", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_MANIPULATION", 6,
-        MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_OBJECT_CATALOG", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 1, 0 "EVENT_OBJECT_SCHEMA", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_OBJECT_TABLE", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 0, 0 "ACTION_ORDER", 10, MYSQL_TYPE_LONG,
-        0, 1, 0 "ACTION_CONDITION", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0
-        "ACTION_STATEMENT", 65535, MYSQL_TYPE_STRING, 0, 0, 0
-        "ACTION_ORIENTATION", 3, MYSQL_TYPE_STRING, 0, 0, 0
-        "ACTION_TIMING", 6, MYSQL_TYPE_STRING, 0, 0, 0
-        "ACTION_REFERENCE_OLD_TABLE", NAME_LEN, MYSQL_TYPE_STRING, 0, 1,
-        0 "ACTION_REFERENCE_NEW_TABLE", NAME_LEN, MYSQL_TYPE_STRING, 0,
-        1, 0 "ACTION_REFERENCE_OLD_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0
-        "ACTION_REFERENCE_NEW_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0
-        "CREATED", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, 0 Additional info from
-        WL#1996.
-      </remark>
+    <remark role="note">
+      Table schema as suggested by
+      http://lists.mysql.com/internals/25556: "TRIGGER_CATALOG",
+      NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0 "TRIGGER_SCHEMA", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 0, 0 "TRIGGER_NAME", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_MANIPULATION", 6,
+      MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_OBJECT_CATALOG", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 1, 0 "EVENT_OBJECT_SCHEMA", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_OBJECT_TABLE", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 0, 0 "ACTION_ORDER", 10, MYSQL_TYPE_LONG, 0,
+      1, 0 "ACTION_CONDITION", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0
+      "ACTION_STATEMENT", 65535, MYSQL_TYPE_STRING, 0, 0, 0
+      "ACTION_ORIENTATION", 3, MYSQL_TYPE_STRING, 0, 0, 0
+      "ACTION_TIMING", 6, MYSQL_TYPE_STRING, 0, 0, 0
+      "ACTION_REFERENCE_OLD_TABLE", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0
+      "ACTION_REFERENCE_NEW_TABLE", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0
+      "ACTION_REFERENCE_OLD_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0
+      "ACTION_REFERENCE_NEW_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0
+      "CREATED", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, 0 Additional info from
+      WL#1996.
+    </remark>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TRIGGER_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TRIGGER_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TRIGGER_NAME</literal></entry>
-              <entry><literal>Trigger</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>EVENT_MANIPULATION</literal></entry>
-              <entry><literal>Event</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>EVENT_OBJECT_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>EVENT_OBJECT_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>EVENT_OBJECT_TABLE</literal></entry>
-              <entry><literal>Table</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ACTION_ORDER</literal></entry>
-              <entry/>
-              <entry><literal>0</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_CONDITION</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_STATEMENT</literal></entry>
-              <entry><literal>Statement</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ACTION_ORIENTATION</literal></entry>
-              <entry/>
-              <entry><literal>ROW</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_TIMING</literal></entry>
-              <entry><literal>Timing</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ACTION_REFERENCE_OLD_TABLE</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_REFERENCE_NEW_TABLE</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_REFERENCE_OLD_ROW</literal></entry>
-              <entry/>
-              <entry><literal>OLD</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_REFERENCE_NEW_ROW</literal></entry>
-              <entry/>
-              <entry><literal>NEW</literal></entry>
-            </row>
-            <row>
-              <entry><literal>CREATED</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal> (<literal>0</literal>)</entry>
-            </row>
-            <row>
-              <entry><literal>SQL_MODE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DEFINER</literal></entry>
-              <entry/>
-              <entry></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TRIGGER_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TRIGGER_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TRIGGER_NAME</literal></entry>
+            <entry><literal>Trigger</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>EVENT_MANIPULATION</literal></entry>
+            <entry><literal>Event</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>EVENT_OBJECT_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>EVENT_OBJECT_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>EVENT_OBJECT_TABLE</literal></entry>
+            <entry><literal>Table</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ACTION_ORDER</literal></entry>
+            <entry/>
+            <entry><literal>0</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_CONDITION</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_STATEMENT</literal></entry>
+            <entry><literal>Statement</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ACTION_ORIENTATION</literal></entry>
+            <entry/>
+            <entry><literal>ROW</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_TIMING</literal></entry>
+            <entry><literal>Timing</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ACTION_REFERENCE_OLD_TABLE</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_REFERENCE_NEW_TABLE</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_REFERENCE_OLD_ROW</literal></entry>
+            <entry/>
+            <entry><literal>OLD</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_REFERENCE_NEW_ROW</literal></entry>
+            <entry/>
+            <entry><literal>NEW</literal></entry>
+          </row>
+          <row>
+            <entry><literal>CREATED</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal> (<literal>0</literal>)</entry>
+          </row>
+          <row>
+            <entry><literal>SQL_MODE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DEFINER</literal></entry>
+            <entry/>
+            <entry></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        <emphasis role="bold">Notes</emphasis>:
-      </para>
+    <para>
+      <emphasis role="bold">Notes</emphasis>:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            The <literal>TRIGGER_SCHEMA</literal> and
-            <literal>TRIGGER_NAME</literal> columns contain the name of
-            the database in which the trigger occurs, and the trigger
-            name, respectively.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>TRIGGER_SCHEMA</literal> and
+          <literal>TRIGGER_NAME</literal> columns contain the name of
+          the database in which the trigger occurs, and the trigger
+          name, respectively.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>EVENT_MANIPULATION</literal> column contains
-            one of the values <literal>'INSERT'</literal>,
-            <literal>'DELETE'</literal>, or <literal>'UPDATE'</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>EVENT_MANIPULATION</literal> column contains one
+          of the values <literal>'INSERT'</literal>,
+          <literal>'DELETE'</literal>, or <literal>'UPDATE'</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            As noted in <xref linkend="triggers"/>, every trigger is
-            associated with exactly one table. The
-            <literal>EVENT_OBJECT_SCHEMA</literal> and
-            <literal>EVENT_OBJECT_TABLE</literal> columns contain the
-            database in which this table occurs, and the table's name.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          As noted in <xref linkend="triggers"/>, every trigger is
+          associated with exactly one table. The
+          <literal>EVENT_OBJECT_SCHEMA</literal> and
+          <literal>EVENT_OBJECT_TABLE</literal> columns contain the
+          database in which this table occurs, and the table's name.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>ACTION_ORDER</literal> statement contains the
-            ordinal position of the trigger's action within the list of
-            all similar triggers on the same table. Currently, this
-            value is always <literal>0</literal>, because it is not
-            possible to have more than one trigger with the same
-            <literal>EVENT_MANIPULATION</literal> and
-            <literal>ACTION_TIMING</literal> on the same table.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ACTION_ORDER</literal> statement contains the
+          ordinal position of the trigger's action within the list of
+          all similar triggers on the same table. Currently, this value
+          is always <literal>0</literal>, because it is not possible to
+          have more than one trigger with the same
+          <literal>EVENT_MANIPULATION</literal> and
+          <literal>ACTION_TIMING</literal> on the same table.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>ACTION_STATEMENT</literal> column contains the
-            statement to be executed when the trigger is invoked. This
-            is the same as the text displayed in the
-            <literal>Statement</literal> column of the output from
-            <literal>SHOW TRIGGERS</literal>. Note that this text uses
-            UTF-8 encoding.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ACTION_STATEMENT</literal> column contains the
+          statement to be executed when the trigger is invoked. This is
+          the same as the text displayed in the
+          <literal>Statement</literal> column of the output from
+          <literal>SHOW TRIGGERS</literal>. Note that this text uses
+          UTF-8 encoding.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>ACTION_ORIENTATION</literal> column always
-            contains the value <literal>'ROW'</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ACTION_ORIENTATION</literal> column always
+          contains the value <literal>'ROW'</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>ACTION_TIMING</literal> column contains one of
-            the two values <literal>'BEFORE'</literal> or
-            <literal>'AFTER'</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ACTION_TIMING</literal> column contains one of
+          the two values <literal>'BEFORE'</literal> or
+          <literal>'AFTER'</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The columns <literal>ACTION_REFERENCE_OLD_ROW</literal> and
-            <literal>ACTION_REFERENCE_NEW_ROW</literal> contain the old
-            and new column identifiers, respectively. This means that
-            <literal>ACTION_REFERENCE_OLD_ROW</literal> always contains
-            the value <literal>'OLD'</literal> and
-            <literal>ACTION_REFERENCE_NEW_ROW</literal> always contains
-            the value <literal>'NEW'</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The columns <literal>ACTION_REFERENCE_OLD_ROW</literal> and
+          <literal>ACTION_REFERENCE_NEW_ROW</literal> contain the old
+          and new column identifiers, respectively. This means that
+          <literal>ACTION_REFERENCE_OLD_ROW</literal> always contains
+          the value <literal>'OLD'</literal> and
+          <literal>ACTION_REFERENCE_NEW_ROW</literal> always contains
+          the value <literal>'NEW'</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>SQL_MODE</literal> column shows the server SQL
-            mode that was in effect at the time when the trigger was
-            created (and thus which remains in effect for this trigger
-            whenever it is invoked, <emphasis>regardless of the current
-            server SQL mode</emphasis>). The possible range of values
-            for this column is the same as that of the
-            <literal>sql_mode</literal> system variable. See
-            <xref linkend="server-sql-mode"/>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>SQL_MODE</literal> column shows the server SQL
+          mode that was in effect at the time when the trigger was
+          created (and thus which remains in effect for this trigger
+          whenever it is invoked, <emphasis>regardless of the current
+          server SQL mode</emphasis>). The possible range of values for
+          this column is the same as that of the
+          <literal>sql_mode</literal> system variable. See
+          <xref linkend="server-sql-mode"/>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>DEFINER</literal> column was added in MySQL
-            5.0.17. <literal>DEFINER</literal> indicates who defined the
-            trigger.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>DEFINER</literal> column was added in MySQL
+          5.0.17. <literal>DEFINER</literal> indicates who defined the
+          trigger.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The following columns currently always contain
-            <literal>NULL</literal>: <literal>TRIGGER_CATALOG</literal>,
-            <literal>EVENT_OBJECT_CATALOG</literal>,
-            <literal>ACTION_CONDITION</literal>,
-            <literal>ACTION_REFERENCE_OLD_TABLE</literal>,
-            <literal>ACTION_REFERENCE_NEW_TABLE</literal>, and
-            <literal>CREATED</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The following columns currently always contain
+          <literal>NULL</literal>: <literal>TRIGGER_CATALOG</literal>,
+          <literal>EVENT_OBJECT_CATALOG</literal>,
+          <literal>ACTION_CONDITION</literal>,
+          <literal>ACTION_REFERENCE_OLD_TABLE</literal>,
+          <literal>ACTION_REFERENCE_NEW_TABLE</literal>, and
+          <literal>CREATED</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        Example, using the <literal>ins_sum</literal> trigger defined in
-        <xref linkend="using-triggers"/>:
-      </para>
+    <para>
+      Example, using the <literal>ins_sum</literal> trigger defined in
+      <xref linkend="using-triggers"/>:
+    </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT * FROM INFORMATION_SCHEMA.TRIGGERS\G</userinput>
@@ -3327,26 +3312,24 @@
 1 row in set (1.54 sec)
 </programlisting>
 
-      <para>
-        See also <xref linkend="show-triggers"/>.
-      </para>
+    <para>
+      See also <xref linkend="show-triggers"/>.
+    </para>
 
-    </section>
+  </section>
 
-    <section id="other-information-schema-tables">
+  <section id="other-information-schema-tables">
 
-      <title>&title-other-information-schema-tables;</title>
+    <title>&title-other-information-schema-tables;</title>
 
-      <para>
-        We intend to implement additional
-        <literal>INFORMATION_SCHEMA</literal> tables. In particular, we
-        acknowledge the need for
-        <literal>INFORMATION_SCHEMA.PARAMETERS</literal> and for
-        <literal>INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS</literal>.
-      </para>
+    <para>
+      We intend to implement additional
+      <literal>INFORMATION_SCHEMA</literal> tables. In particular, we
+      acknowledge the need for
+      <literal>INFORMATION_SCHEMA.PARAMETERS</literal> and for
+      <literal>INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS</literal>.
+    </para>
 
-    </section>
-
   </section>
 
   <section id="extended-show">

Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt	2006-01-28 23:48:21 UTC (rev 1093)
+++ trunk/refman-5.0/renamed-nodes.txt	2006-01-29 01:03:24 UTC (rev 1094)
@@ -410,3 +410,4 @@
 upgrading-grant-tables mysql-fix-privilege-tables
 secure-grant grant
 secure-requirements secure-using-openssl
+information-schema-tables information-schema

Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml	2006-01-28 23:48:21 UTC (rev 1093)
+++ trunk/refman-5.1/information-schema.xml	2006-01-29 01:03:24 UTC (rev 1094)
@@ -213,123 +213,114 @@
     order to see information about it.
   </para>
 
-  <section id="information-schema-tables">
+  <para>
+    <emphasis role="bold">Explanation of following sections</emphasis>
+  </para>
 
-    <title>&title-information-schema-tables;</title>
+  <para>
+    In the following sections, we take the tables and columns that are
+    in <literal>INFORMATION_SCHEMA</literal>. For each column, there are
+    three pieces of information:
+  </para>
 
-    <indexterm type="function">
-      <primary>INFORMATION_SCHEMA</primary>
-    </indexterm>
+  <itemizedlist>
 
-    <para>
-      <emphasis role="bold">Explanation of following sections</emphasis>
-    </para>
+    <listitem>
+      <para>
+        <quote>Standard Name</quote> indicates the standard SQL name for
+        the column.
+      </para>
+    </listitem>
 
-    <para>
-      In the following sections, we take the tables and columns that are
-      in <literal>INFORMATION_SCHEMA</literal>. For each column, there
-      are three pieces of information:
-    </para>
+    <listitem>
+      <para>
+        <quote><literal>SHOW</literal> name</quote> indicates what the
+        equivalent field name is in the closest <literal>SHOW</literal>
+        statement, if any.
+      </para>
+    </listitem>
 
-    <itemizedlist>
+    <listitem>
+      <para>
+        <quote>Remarks</quote> provides additional information where
+        applicable.
 
-      <listitem>
-        <para>
-          <quote>Standard Name</quote> indicates the standard SQL name
-          for the column.
-        </para>
-      </listitem>
+        <remark>
+          We have marked ``omit'' those columns for which MySQL has no
+          present use. We have omitted these columns, that is, they
+          appear in the standard but not in MySQL. So their presence
+          here is a matter of record only.
+        </remark>
+      </para>
+    </listitem>
 
-      <listitem>
-        <para>
-          <quote><literal>SHOW</literal> name</quote> indicates what the
-          equivalent field name is in the closest
-          <literal>SHOW</literal> statement, if any.
-        </para>
-      </listitem>
+  </itemizedlist>
 
-      <listitem>
-        <para>
-          <quote>Remarks</quote> provides additional information where
-          applicable.
+  <para>
+    To avoid using any name that is reserved in the standard or in DB2,
+    SQL Server, or Oracle, we changed the names of columns marked
+    <emphasis role="bold">MySQL extension</emphasis>. (For example, we
+    changed <literal>COLLATION</literal> to
+    <literal>TABLE_COLLATION</literal> in the <literal>TABLES</literal>
+    table.) See the list of reserved words near the end of this article:
+    <ulink url="http://www.dbazine.com/gulutzan5.shtml"/>.
+  </para>
 
-          <remark>
-            We have marked ``omit'' those columns for which MySQL has no
-            present use. We have omitted these columns, that is, they
-            appear in the standard but not in MySQL. So their presence
-            here is a matter of record only.
-          </remark>
-        </para>
-      </listitem>
+  <para>
+    The definition for character columns (for example,
+    <literal>TABLES.TABLE_NAME</literal>), is generally
+    <literal>VARCHAR(<replaceable>N</replaceable>) CHARACTER SET
+    utf8</literal> where <replaceable>N</replaceable> is at least 64.
+  </para>
 
-    </itemizedlist>
+  <para>
+    Each section indicates what <literal>SHOW</literal> statement is
+    equivalent to a <literal>SELECT</literal> that retrieves information
+    from <literal>INFORMATION_SCHEMA</literal>, or else that there is no
+    such equivalent statement.
+  </para>
 
-    <para>
-      To avoid using any name that is reserved in the standard or in
-      DB2, SQL Server, or Oracle, we changed the names of columns marked
-      <emphasis role="bold">MySQL extension</emphasis>. (For example, we
-      changed <literal>COLLATION</literal> to
-      <literal>TABLE_COLLATION</literal> in the
-      <literal>TABLES</literal> table.) See the list of reserved words
-      near the end of this article:
-      <ulink url="http://www.dbazine.com/gulutzan5.shtml"/>.
-    </para>
+  <para>
+    <emphasis role="bold">Note</emphasis>: At present, there are some
+    missing columns and some columns out of order. We are working on
+    this and intend to update the documentation as changes are made.
+  </para>
 
-    <para>
-      The definition for character columns (for example,
-      <literal>TABLES.TABLE_NAME</literal>), is generally
-      <literal>VARCHAR(<replaceable>N</replaceable>) CHARACTER SET
-      utf8</literal> where <replaceable>N</replaceable> is at least 64.
-    </para>
+  <section id="schemata-table">
 
-    <para>
-      Each section indicates what <literal>SHOW</literal> statement is
-      equivalent to a <literal>SELECT</literal> that retrieves
-      information from <literal>INFORMATION_SCHEMA</literal>, or else
-      that there is no such equivalent statement.
-    </para>
+    <title>&title-schemata-table;</title>
 
+    <indexterm type="function">
+      <primary>SCHEMATA</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
+
     <para>
-      <emphasis role="bold">Note</emphasis>: At present, there are some
-      missing columns and some columns out of order. We are working on
-      this and intend to update the documentation as changes are made.
+      A schema is a database, so the <literal>SCHEMATA</literal> table
+      provides information about databases.
     </para>
 
-    <section id="schemata-table">
-
-      <title>&title-schemata-table;</title>
-
-      <indexterm type="function">
-        <primary>SCHEMATA</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
-
-      <para>
-        A schema is a database, so the <literal>SCHEMATA</literal> table
-        provides information about databases.
-      </para>
-
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>CATALOG_NAME</literal></entry>
-              <entry>-</entry>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>SCHEMA_NAME</literal></entry>
-              <entry/>
-              <entry>Database</entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>CATALOG_NAME</literal></entry>
+            <entry>-</entry>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>SCHEMA_NAME</literal></entry>
+            <entry/>
+            <entry>Database</entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -363,34 +354,34 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>DEFAULT_CHARACTER_SET_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DEFAULT_COLLATION_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SQL_PATH</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>DEFAULT_CHARACTER_SET_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DEFAULT_COLLATION_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SQL_PATH</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        <emphasis role="bold">Note</emphasis>: The value of the
-        <literal>SQL_PATH</literal> column is always
-        <literal>NULL</literal>.
-      </para>
+    <para>
+      <emphasis role="bold">Note</emphasis>: The value of the
+      <literal>SQL_PATH</literal> column is always
+      <literal>NULL</literal>.
+    </para>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT SCHEMA_NAME AS `Database
@@ -401,53 +392,53 @@
     [LIKE 'wild']
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="tables-table">
+  <section id="tables-table">
 
-      <title>&title-tables-table;</title>
+    <title>&title-tables-table;</title>
 
-      <indexterm type="function">
-        <primary>TABLES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>TABLES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>TABLES</literal> table provides information about
-        tables in databases.
-      </para>
+    <para>
+      The <literal>TABLES</literal> table provides information about
+      tables in databases.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry><literal>Table_</literal>...</entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry><literal>Table_</literal>...</entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry><literal>Table_</literal>...</entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry><literal>Table_</literal>...</entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -514,148 +505,148 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>ENGINE</literal></entry>
-              <entry><literal>Engine</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>VERSION</literal></entry>
-              <entry><literal>Version</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>ROW_FORMAT</literal></entry>
-              <entry><literal>Row_format</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_ROWS</literal></entry>
-              <entry><literal>Rows</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>AVG_ROW_LENGTH</literal></entry>
-              <entry><literal>Avg_row_length</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>DATA_LENGTH</literal></entry>
-              <entry><literal>Data_length</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>MAX_DATA_LENGTH</literal></entry>
-              <entry><literal>Max_data_length</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>INDEX_LENGTH</literal></entry>
-              <entry><literal>Index_length</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>DATA_FREE</literal></entry>
-              <entry><literal>Data_free</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>AUTO_INCREMENT</literal></entry>
-              <entry><literal>Auto_increment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>CREATE_TIME</literal></entry>
-              <entry><literal>Create_time</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>UPDATE_TIME</literal></entry>
-              <entry><literal>Update_time</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>CHECK_TIME</literal></entry>
-              <entry><literal>Check_time</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_COLLATION</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>CHECKSUM</literal></entry>
-              <entry><literal>Checksum</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>CREATE_OPTIONS</literal></entry>
-              <entry><literal>Create_options</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_COMMENT</literal></entry>
-              <entry><literal>Comment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>ENGINE</literal></entry>
+            <entry><literal>Engine</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>VERSION</literal></entry>
+            <entry><literal>Version</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>ROW_FORMAT</literal></entry>
+            <entry><literal>Row_format</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_ROWS</literal></entry>
+            <entry><literal>Rows</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>AVG_ROW_LENGTH</literal></entry>
+            <entry><literal>Avg_row_length</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>DATA_LENGTH</literal></entry>
+            <entry><literal>Data_length</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>MAX_DATA_LENGTH</literal></entry>
+            <entry><literal>Max_data_length</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>INDEX_LENGTH</literal></entry>
+            <entry><literal>Index_length</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>DATA_FREE</literal></entry>
+            <entry><literal>Data_free</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>AUTO_INCREMENT</literal></entry>
+            <entry><literal>Auto_increment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>CREATE_TIME</literal></entry>
+            <entry><literal>Create_time</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>UPDATE_TIME</literal></entry>
+            <entry><literal>Update_time</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>CHECK_TIME</literal></entry>
+            <entry><literal>Check_time</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_COLLATION</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>CHECKSUM</literal></entry>
+            <entry><literal>Checksum</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>CREATE_OPTIONS</literal></entry>
+            <entry><literal>Create_options</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_COMMENT</literal></entry>
+            <entry><literal>Comment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            <literal>TABLE_SCHEMA</literal> and
-            <literal>TABLE_NAME</literal> are a single field in a
-            <literal>SHOW</literal> display, for example
-            <literal>Table_in_db1</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>TABLE_SCHEMA</literal> and
+          <literal>TABLE_NAME</literal> are a single field in a
+          <literal>SHOW</literal> display, for example
+          <literal>Table_in_db1</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>TABLE_TYPE</literal> should be <literal>BASE
-            TABLE</literal> or <literal>VIEW</literal>. If table is
-            temporary, then <literal>TABLE_TYPE</literal> =
-            <literal>TEMPORARY</literal>. (There are no temporary views,
-            so this is not ambiguous.)
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>TABLE_TYPE</literal> should be <literal>BASE
+          TABLE</literal> or <literal>VIEW</literal>. If table is
+          temporary, then <literal>TABLE_TYPE</literal> =
+          <literal>TEMPORARY</literal>. (There are no temporary views,
+          so this is not ambiguous.)
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>TABLE_ROWS</literal> column is
-            <literal>NULL</literal> if the table is in the
-            <literal>INFORMATION_SCHEMA</literal> database. For
-            <literal>InnoDB</literal> tables, the row count is only a
-            rough estimate used in SQL optimization.
-          </para>
+      <listitem>
+        <para>
+          The <literal>TABLE_ROWS</literal> column is
+          <literal>NULL</literal> if the table is in the
+          <literal>INFORMATION_SCHEMA</literal> database. For
+          <literal>InnoDB</literal> tables, the row count is only a
+          rough estimate used in SQL optimization.
+        </para>
 
-          <remark role="todo">
-            TEMPORARY tables are missing at the moment; perhaps because
-            they don't appear in the output of SHOW TABLES, either?
-          </remark>
-        </listitem>
+        <remark role="todo">
+          TEMPORARY tables are missing at the moment; perhaps because
+          they don't appear in the output of SHOW TABLES, either?
+        </remark>
+      </listitem>
 
-        <listitem>
-          <para>
-            We have nothing for the table's default character set.
-            <literal>TABLE_COLLATION</literal> is close, because
-            collation names begin with a character set name.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          We have nothing for the table's default character set.
+          <literal>TABLE_COLLATION</literal> is close, because collation
+          names begin with a character set name.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT table_name FROM INFORMATION_SCHEMA.TABLES
@@ -667,88 +658,88 @@
   [LIKE 'wild']
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="columns-table">
+  <section id="columns-table">
 
-      <title>&title-columns-table;</title>
+    <title>&title-columns-table;</title>
 
-      <indexterm type="function">
-        <primary>COLUMNS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>COLUMNS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>COLUMNS</literal> table provides information about
-        columns in tables.
-      </para>
+    <para>
+      The <literal>COLUMNS</literal> table provides information about
+      columns in tables.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLUMN_NAME</literal></entry>
-              <entry><literal>Field</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ORDINAL_POSITION</literal></entry>
-              <entry/>
-              <entry>see notes</entry>
-            </row>
-            <row>
-              <entry><literal>COLUMN_DEFAULT</literal></entry>
-              <entry><literal>Default</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_NULLABLE</literal></entry>
-              <entry><literal>Null</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DATA_TYPE</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CHARACTER_MAXIMUM_LENGTH</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CHARACTER_OCTET_LENGTH</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>NUMERIC_PRECISION</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry/>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLUMN_NAME</literal></entry>
+            <entry><literal>Field</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ORDINAL_POSITION</literal></entry>
+            <entry/>
+            <entry>see notes</entry>
+          </row>
+          <row>
+            <entry><literal>COLUMN_DEFAULT</literal></entry>
+            <entry><literal>Default</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_NULLABLE</literal></entry>
+            <entry><literal>Null</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DATA_TYPE</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CHARACTER_MAXIMUM_LENGTH</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CHARACTER_OCTET_LENGTH</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>NUMERIC_PRECISION</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -760,11 +751,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>NUMERIC_SCALE</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>NUMERIC_SCALE</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -820,11 +811,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>CHARACTER_SET_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>CHARACTER_SET_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -847,11 +838,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>COLLATION_NAME</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>COLLATION_NAME</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1061,78 +1052,77 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>COLUMN_TYPE</literal></entry>
-              <entry><literal>Type</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>COLUMN_KEY</literal></entry>
-              <entry><literal>Key</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>EXTRA</literal></entry>
-              <entry><literal>Extra</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>COLUMN_COMMENT</literal></entry>
-              <entry><literal>Comment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>COLUMN_TYPE</literal></entry>
+            <entry><literal>Type</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>COLUMN_KEY</literal></entry>
+            <entry><literal>Key</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>EXTRA</literal></entry>
+            <entry><literal>Extra</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>COLUMN_COMMENT</literal></entry>
+            <entry><literal>Comment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            In <literal>SHOW</literal>, the <literal>Type</literal>
-            display includes values from several different
-            <literal>COLUMNS</literal> columns.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          In <literal>SHOW</literal>, the <literal>Type</literal>
+          display includes values from several different
+          <literal>COLUMNS</literal> columns.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>ORDINAL_POSITION</literal> is necessary because you
-            might someday want to say <literal>ORDER BY
-            ORDINAL_POSITION</literal>. Unlike <literal>SHOW</literal>,
-            <literal>SELECT</literal> does not have automatic ordering.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>ORDINAL_POSITION</literal> is necessary because you
+          might someday want to say <literal>ORDER BY
+          ORDINAL_POSITION</literal>. Unlike <literal>SHOW</literal>,
+          <literal>SELECT</literal> does not have automatic ordering.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>CHARACTER_OCTET_LENGTH</literal> should be the same
-            as <literal>CHARACTER_MAXIMUM_LENGTH</literal>, except for
-            multi-byte character sets.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>CHARACTER_OCTET_LENGTH</literal> should be the same
+          as <literal>CHARACTER_MAXIMUM_LENGTH</literal>, except for
+          multi-byte character sets.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>CHARACTER_SET_NAME</literal> can be derived from
-            <literal>Collation</literal>. For example, if you say
-            <literal>SHOW FULL COLUMNS FROM t</literal>, and you see in
-            the <literal>Collation</literal> column a value of
-            <literal>latin1_swedish_ci</literal>, the character set is
-            what's before the first underscore:
-            <literal>latin1</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>CHARACTER_SET_NAME</literal> can be derived from
+          <literal>Collation</literal>. For example, if you say
+          <literal>SHOW FULL COLUMNS FROM t</literal>, and you see in
+          the <literal>Collation</literal> column a value of
+          <literal>latin1_swedish_ci</literal>, the character set is
+          what's before the first underscore: <literal>latin1</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are nearly equivalent:
-      </para>
+    <para>
+      The following statements are nearly equivalent:
+    </para>
 
 <programlisting>
 SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT
@@ -1147,63 +1137,63 @@
   [LIKE wild]
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="statistics-table">
+  <section id="statistics-table">
 
-      <title>&title-statistics-table;</title>
+    <title>&title-statistics-table;</title>
 
-      <indexterm type="function">
-        <primary>STATISTICS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>STATISTICS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>STATISTICS</literal> table provides information
-        about table indexes.
-      </para>
+    <para>
+      The <literal>STATISTICS</literal> table provides information about
+      table indexes.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry>= Database</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry><literal>Table</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>NON_UNIQUE</literal></entry>
-              <entry><literal>Non_unique</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>INDEX_SCHEMA</literal></entry>
-              <entry/>
-              <entry>= Database</entry>
-            </row>
-            <row>
-              <entry><literal>INDEX_NAME</literal></entry>
-              <entry><literal>Key_name</literal></entry>
-              <entry/>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry>= Database</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry><literal>Table</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>NON_UNIQUE</literal></entry>
+            <entry><literal>Non_unique</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>INDEX_SCHEMA</literal></entry>
+            <entry/>
+            <entry>= Database</entry>
+          </row>
+          <row>
+            <entry><literal>INDEX_NAME</literal></entry>
+            <entry><literal>Key_name</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1215,26 +1205,26 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SEQ_IN_INDEX</literal></entry>
-              <entry><literal>Seq_in_index</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLUMN_NAME</literal></entry>
-              <entry><literal>Column_name</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLLATION</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CARDINALITY</literal></entry>
-              <entry><literal>Cardinality</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>SEQ_IN_INDEX</literal></entry>
+            <entry><literal>Seq_in_index</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLUMN_NAME</literal></entry>
+            <entry><literal>Column_name</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLLATION</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CARDINALITY</literal></entry>
+            <entry><literal>Cardinality</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1257,63 +1247,63 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SUB_PART</literal></entry>
-              <entry><literal>Sub_part</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>PACKED</literal></entry>
-              <entry><literal>Packed</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>NULLABLE</literal></entry>
-              <entry><literal>Null</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>INDEX_TYPE</literal></entry>
-              <entry><literal>Index_type</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>COMMENT</literal></entry>
-              <entry><literal>Comment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>SUB_PART</literal></entry>
+            <entry><literal>Sub_part</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>PACKED</literal></entry>
+            <entry><literal>Packed</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>NULLABLE</literal></entry>
+            <entry><literal>Null</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>INDEX_TYPE</literal></entry>
+            <entry><literal>Index_type</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>COMMENT</literal></entry>
+            <entry><literal>Comment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            There is no standard table for indexes. The preceding list
-            is similar to what SQL Server 2000 returns for
-            <literal>sp_statistics</literal>, except that we replaced
-            the name <literal>QUALIFIER</literal> with
-            <literal>CATALOG</literal> and we replaced the name
-            <literal>OWNER</literal> with <literal>SCHEMA</literal>.
-          </para>
+      <listitem>
+        <para>
+          There is no standard table for indexes. The preceding list is
+          similar to what SQL Server 2000 returns for
+          <literal>sp_statistics</literal>, except that we replaced the
+          name <literal>QUALIFIER</literal> with
+          <literal>CATALOG</literal> and we replaced the name
+          <literal>OWNER</literal> with <literal>SCHEMA</literal>.
+        </para>
 
-          <para>
-            Clearly, the preceding table and the output from
-            <literal>SHOW INDEX</literal> are derived from the same
-            parent. So the correlation is already close.
-          </para>
-        </listitem>
+        <para>
+          Clearly, the preceding table and the output from <literal>SHOW
+          INDEX</literal> are derived from the same parent. So the
+          correlation is already close.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT * FROM INFORMATION_SCHEMA.STATISTICS
@@ -1325,173 +1315,173 @@
   [FROM db_name]
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="user-privileges-table">
+  <section id="user-privileges-table">
 
-      <title>&title-user-privileges-table;</title>
+    <title>&title-user-privileges-table;</title>
 
-      <indexterm type="function">
-        <primary>USER_PRIVILEGES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>USER_PRIVILEGES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>USER_PRIVILEGES</literal> table provides
-        information about global privileges. This information comes from
-        the <literal>mysql.user</literal> grant table.
-      </para>
+    <para>
+      The <literal>USER_PRIVILEGES</literal> table provides information
+      about global privileges. This information comes from the
+      <literal>mysql.user</literal> grant table.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>GRANTEE</literal></entry>
-              <entry/>
-              <entry>e.g. 'user'@'host'</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>PRIVILEGE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_GRANTABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>GRANTEE</literal></entry>
+            <entry/>
+            <entry>e.g. 'user'@'host'</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>PRIVILEGE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_GRANTABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            This is a non-standard table. It takes its values from the
-            <literal>mysql.user</literal> table.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          This is a non-standard table. It takes its values from the
+          <literal>mysql.user</literal> table.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="schema-privileges-table">
+  <section id="schema-privileges-table">
 
-      <title>&title-schema-privileges-table;</title>
+    <title>&title-schema-privileges-table;</title>
 
-      <indexterm type="function">
-        <primary>SCHEMA_PRIVILEGES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>SCHEMA_PRIVILEGES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>SCHEMA_PRIVILEGES</literal> table provides
-        information about schema (database) privileges. This information
-        comes from the <literal>mysql.db</literal> grant table.
-      </para>
+    <para>
+      The <literal>SCHEMA_PRIVILEGES</literal> table provides
+      information about schema (database) privileges. This information
+      comes from the <literal>mysql.db</literal> grant table.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>GRANTEE</literal></entry>
-              <entry/>
-              <entry>e.g. 'user'@'host'</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PRIVILEGE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_GRANTABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>GRANTEE</literal></entry>
+            <entry/>
+            <entry>e.g. 'user'@'host'</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PRIVILEGE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_GRANTABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            This is a non-standard table. It takes its values from the
-            <literal>mysql.db</literal> table.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          This is a non-standard table. It takes its values from the
+          <literal>mysql.db</literal> table.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="table-privileges-table">
+  <section id="table-privileges-table">
 
-      <title>&title-table-privileges-table;</title>
+    <title>&title-table-privileges-table;</title>
 
-      <indexterm type="function">
-        <primary>TABLE_PRIVILEGES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>TABLE_PRIVILEGES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>TABLE_PRIVILEGES</literal> table provides
-        information about table privileges. This information comes from
-        the <literal>mysql.tables_priv</literal> grant table.
-      </para>
+    <para>
+      The <literal>TABLE_PRIVILEGES</literal> table provides information
+      about table privileges. This information comes from the
+      <literal>mysql.tables_priv</literal> grant table.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -1503,36 +1493,36 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>GRANTEE</literal></entry>
-              <entry/>
-              <entry>e.g. 'user'@'host'</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PRIVILEGE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_GRANTABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>GRANTEE</literal></entry>
+            <entry/>
+            <entry>e.g. 'user'@'host'</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PRIVILEGE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_GRANTABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1544,14 +1534,13 @@
            </entry>
          </row>
          -->
-          </tbody>
-        </tgroup>
-      </informaltable>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        The following statements are <emphasis>not</emphasis>
-        equivalent:
-      </para>
+    <para>
+      The following statements are <emphasis>not</emphasis> equivalent:
+    </para>
 
 <programlisting>
 SELECT ... FROM INFORMATION_SCHEMA.TABLE_PRIVILEGES
@@ -1559,43 +1548,43 @@
 SHOW GRANTS ...
 </programlisting>
 
-      <para>
-        <literal>PRIVILEGE_TYPE</literal> can contain one (and only one)
-        of these values: <literal>SELECT</literal>,
-        <literal>INSERT</literal>, <literal>UPDATE</literal>,
-        <literal>REFERENCES</literal>, <literal>ALTER</literal>,
-        <literal>INDEX</literal>, <literal>DROP</literal>,
-        <literal>CREATE VIEW</literal>.
-      </para>
+    <para>
+      <literal>PRIVILEGE_TYPE</literal> can contain one (and only one)
+      of these values: <literal>SELECT</literal>,
+      <literal>INSERT</literal>, <literal>UPDATE</literal>,
+      <literal>REFERENCES</literal>, <literal>ALTER</literal>,
+      <literal>INDEX</literal>, <literal>DROP</literal>, <literal>CREATE
+      VIEW</literal>.
+    </para>
 
-    </section>
+  </section>
 
-    <section id="column-privileges-table">
+  <section id="column-privileges-table">
 
-      <title>&title-column-privileges-table;</title>
+    <title>&title-column-privileges-table;</title>
 
-      <indexterm type="function">
-        <primary>COLUMN_PRIVILEGES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>COLUMN_PRIVILEGES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>COLUMN_PRIVILEGES</literal> table provides
-        information about column privileges. This information comes from
-        the <literal>mysql.columns_priv</literal> grant table.
-      </para>
+    <para>
+      The <literal>COLUMN_PRIVILEGES</literal> table provides
+      information about column privileges. This information comes from
+      the <literal>mysql.columns_priv</literal> grant table.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -1607,87 +1596,86 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>GRANTEE</literal></entry>
-              <entry/>
-              <entry>e.g. 'user'@'host'</entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLUMN_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PRIVILEGE_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_GRANTABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>GRANTEE</literal></entry>
+            <entry/>
+            <entry>e.g. 'user'@'host'</entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLUMN_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PRIVILEGE_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_GRANTABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            In the output from <literal>SHOW FULL COLUMNS</literal>, the
-            privileges are all in one field and in lowercase, for
-            example, <literal>select,insert,update,references</literal>.
-            In <literal>COLUMN_PRIVILEGES</literal>, there is one row
-            per privilege, and it's uppercase.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          In the output from <literal>SHOW FULL COLUMNS</literal>, the
+          privileges are all in one field and in lowercase, for example,
+          <literal>select,insert,update,references</literal>. In
+          <literal>COLUMN_PRIVILEGES</literal>, there is one row per
+          privilege, and it's uppercase.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>PRIVILEGE_TYPE</literal> can contain one (and only
-            one) of these values: <literal>SELECT</literal>,
-            <literal>INSERT</literal>, <literal>UPDATE</literal>,
-            <literal>REFERENCES</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <literal>PRIVILEGE_TYPE</literal> can contain one (and only
+          one) of these values: <literal>SELECT</literal>,
+          <literal>INSERT</literal>, <literal>UPDATE</literal>,
+          <literal>REFERENCES</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            If the user has <literal>GRANT OPTION</literal> privilege,
-            <literal>IS_GRANTABLE</literal> should be
-            <literal>YES</literal>. Otherwise,
-            <literal>IS_GRANTABLE</literal> should be
-            <literal>NO</literal>. The output does not list
-            <literal>GRANT OPTION</literal> as a separate privilege.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          If the user has <literal>GRANT OPTION</literal> privilege,
+          <literal>IS_GRANTABLE</literal> should be
+          <literal>YES</literal>. Otherwise,
+          <literal>IS_GRANTABLE</literal> should be
+          <literal>NO</literal>. The output does not list <literal>GRANT
+          OPTION</literal> as a separate privilege.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are <emphasis>not</emphasis>
-        equivalent:
-      </para>
+    <para>
+      The following statements are <emphasis>not</emphasis> equivalent:
+    </para>
 
 <programlisting>
 SELECT ... FROM INFORMATION_SCHEMA.COLUMN_PRIVILEGES
@@ -1695,33 +1683,33 @@
 SHOW GRANTS ...
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="character-sets-table">
+  <section id="character-sets-table">
 
-      <title>&title-character-sets-table;</title>
+    <title>&title-character-sets-table;</title>
 
-      <indexterm type="function">
-        <primary>CHARACTER_SETS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>CHARACTER_SETS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>CHARACTER_SETS</literal> table provides information
-        about available character sets.
-      </para>
+    <para>
+      The <literal>CHARACTER_SETS</literal> table provides information
+      about available character sets.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -1744,11 +1732,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>CHARACTER_SET_NAME</literal></entry>
-              <entry><literal>Charset</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>CHARACTER_SET_NAME</literal></entry>
+            <entry><literal>Charset</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -1804,45 +1792,45 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>DEFAULT_COLLATE_NAME</literal></entry>
-              <entry><literal>Default collation</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DESCRIPION</literal></entry>
-              <entry><literal>Description</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>MAXLEN</literal></entry>
-              <entry><literal>Maxlen</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>DEFAULT_COLLATE_NAME</literal></entry>
+            <entry><literal>Default collation</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DESCRIPION</literal></entry>
+            <entry><literal>Description</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>MAXLEN</literal></entry>
+            <entry><literal>Maxlen</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            We have added two non-standard columns corresponding to the
-            <literal>Description</literal> and <literal>Maxlen</literal>
-            columns in the output from <literal>SHOW CHARACTER
-            SET</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          We have added two non-standard columns corresponding to the
+          <literal>Description</literal> and <literal>Maxlen</literal>
+          columns in the output from <literal>SHOW CHARACTER
+          SET</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT * FROM INFORMATION_SCHEMA.CHARACTER_SETS
@@ -1852,33 +1840,33 @@
   [LIKE 'wild']
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="collations-table">
+  <section id="collations-table">
 
-      <title>&title-collations-table;</title>
+    <title>&title-collations-table;</title>
 
-      <indexterm type="function">
-        <primary>COLLATIONS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>COLLATIONS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>COLLATIONS</literal> table provides information
-        about collations for each character set.
-      </para>
+    <para>
+      The <literal>COLLATIONS</literal> table provides information about
+      collations for each character set.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -1901,11 +1889,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>COLLATION_NAME</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>COLLATION_NAME</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2005,31 +1993,31 @@
            </entry>
          </row>
          -->
-          </tbody>
-        </tgroup>
-      </informaltable>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            We have added five non-standard columns corresponding to the
-            <literal>Charset</literal>, <literal>Id</literal>,
-            <literal>Default</literal>, <literal>Compiled</literal>, and
-            <literal>Sortlen</literal> columns in the output from
-            <literal>SHOW COLLATION</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          We have added five non-standard columns corresponding to the
+          <literal>Charset</literal>, <literal>Id</literal>,
+          <literal>Default</literal>, <literal>Compiled</literal>, and
+          <literal>Sortlen</literal> columns in the output from
+          <literal>SHOW COLLATION</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        The following statements are equivalent:
-      </para>
+    <para>
+      The following statements are equivalent:
+    </para>
 
 <programlisting>
 SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS
@@ -2039,35 +2027,35 @@
   [LIKE 'wild']
 </programlisting>
 
-    </section>
+  </section>
 
-    <section id="collation-character-set-applicability-table">
+  <section id="collation-character-set-applicability-table">
 
-      <title>&title-collation-character-set-applicability-table;</title>
+    <title>&title-collation-character-set-applicability-table;</title>
 
-      <indexterm type="function">
-        <primary>COLLATION_CHARACTER_SET_APPLICABILITY</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>COLLATION_CHARACTER_SET_APPLICABILITY</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>COLLATION_CHARACTER_SET_APPLICABILITY</literal>
-        table indicates what character set is applicable for what
-        collation. The columns are equivalent to the first two display
-        fields that we get from <literal>SHOW COLLATION</literal>.
-      </para>
+    <para>
+      The <literal>COLLATION_CHARACTER_SET_APPLICABILITY</literal> table
+      indicates what character set is applicable for what collation. The
+      columns are equivalent to the first two display fields that we get
+      from <literal>SHOW COLLATION</literal>.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -2090,11 +2078,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>COLLATION_NAME</literal></entry>
-              <entry><literal>Collation</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>COLLATION_NAME</literal></entry>
+            <entry><literal>Collation</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2117,57 +2105,57 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>CHARACTER_SET_NAME</literal></entry>
-              <entry><literal>Charset</literal></entry>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>CHARACTER_SET_NAME</literal></entry>
+            <entry><literal>Charset</literal></entry>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-    </section>
+  </section>
 
-    <section id="table-constraints-table">
+  <section id="table-constraints-table">
 
-      <title>&title-table-constraints-table;</title>
+    <title>&title-table-constraints-table;</title>
 
-      <indexterm type="function">
-        <primary>CONSTRAINTS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>CONSTRAINTS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>TABLE_CONSTRAINTS</literal> table describes which
-        tables have constraints.
-      </para>
+    <para>
+      The <literal>TABLE_CONSTRAINTS</literal> table describes which
+      tables have constraints.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2179,21 +2167,21 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2216,176 +2204,175 @@
            </entry>
          </row>
          -->
-          </tbody>
-        </tgroup>
-      </informaltable>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            The <literal>CONSTRAINT_TYPE</literal> value can be
-            <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>,
-            or <literal>FOREIGN KEY</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>CONSTRAINT_TYPE</literal> value can be
+          <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, or
+          <literal>FOREIGN KEY</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>UNIQUE</literal> and <literal>PRIMARY
-            KEY</literal> information is about the same as what you get
-            from the <literal>Key_name</literal> field in the output
-            from <literal>SHOW INDEX</literal> when the
-            <literal>Non_unique</literal> field is <literal>0</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>UNIQUE</literal> and <literal>PRIMARY
+          KEY</literal> information is about the same as what you get
+          from the <literal>Key_name</literal> field in the output from
+          <literal>SHOW INDEX</literal> when the
+          <literal>Non_unique</literal> field is <literal>0</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>CONSTRAINT_TYPE</literal> column can contain
-            one of these values: <literal>UNIQUE</literal>,
-            <literal>PRIMARY KEY</literal>, <literal>FOREIGN
-            KEY</literal>, <literal>CHECK</literal>. This is a
-            <literal>CHAR</literal> (not <literal>ENUM</literal>)
-            column. The <literal>CHECK</literal> value is not available
-            until we support <literal>CHECK</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>CONSTRAINT_TYPE</literal> column can contain one
+          of these values: <literal>UNIQUE</literal>, <literal>PRIMARY
+          KEY</literal>, <literal>FOREIGN KEY</literal>,
+          <literal>CHECK</literal>. This is a <literal>CHAR</literal>
+          (not <literal>ENUM</literal>) column. The
+          <literal>CHECK</literal> value is not available until we
+          support <literal>CHECK</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="key-column-usage-table">
+  <section id="key-column-usage-table">
 
-      <title>&title-key-column-usage-table;</title>
+    <title>&title-key-column-usage-table;</title>
 
-      <indexterm type="function">
-        <primary>KEY_COLUMN_USAGE</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>KEY_COLUMN_USAGE</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>KEY_COLUMN_USAGE</literal> table describes which
-        key columns have constraints.
-      </para>
+    <para>
+      The <literal>KEY_COLUMN_USAGE</literal> table describes which key
+      columns have constraints.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CONSTRAINT_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COLUMN_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ORDINAL_POSITION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>POSITION_IN_UNIQUE_CONSTRAINT</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>REFERENCED_TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>REFERENCED_TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>REFERENCED_COLUMN_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CONSTRAINT_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COLUMN_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ORDINAL_POSITION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>POSITION_IN_UNIQUE_CONSTRAINT</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>REFERENCED_TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>REFERENCED_TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>REFERENCED_COLUMN_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            If the constraint is a foreign key, then this is the column
-            of the foreign key, not the column that the foreign key
-            references.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          If the constraint is a foreign key, then this is the column of
+          the foreign key, not the column that the foreign key
+          references.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The value of <literal>ORDINAL_POSITION</literal> is the
-            column's position within the constraint, not the column's
-            position within the table. Column positions are numbered
-            beginning with 1.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The value of <literal>ORDINAL_POSITION</literal> is the
+          column's position within the constraint, not the column's
+          position within the table. Column positions are numbered
+          beginning with 1.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The value of
-            <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal> is
-            <literal>NULL</literal> for unique and primary-key
-            constraints. For foreign-key constraints, it is the ordinal
-            position in key of the table that is being referenced.
-          </para>
+      <listitem>
+        <para>
+          The value of <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>
+          is <literal>NULL</literal> for unique and primary-key
+          constraints. For foreign-key constraints, it is the ordinal
+          position in key of the table that is being referenced.
+        </para>
 
-          <para>
-            For example, suppose that there are two tables name
-            <literal>t1</literal> and <literal>t3</literal> that have
-            the following definitions:
-          </para>
+        <para>
+          For example, suppose that there are two tables name
+          <literal>t1</literal> and <literal>t3</literal> that have the
+          following definitions:
+        </para>
 
 <programlisting>
 CREATE TABLE t1
@@ -2406,76 +2393,74 @@
 ) ENGINE=InnoDB;
 </programlisting>
 
-          <para>
-            For those two tables, the
-            <literal>KEY_COLUMN_USAGE</literal> table has two rows:
-          </para>
+        <para>
+          For those two tables, the <literal>KEY_COLUMN_USAGE</literal>
+          table has two rows:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                One row with
-                <literal>CONSTRAINT_NAME</literal>='PRIMARY',
-                <literal>TABLE_NAME</literal>='t1',
-                <literal>COLUMN_NAME</literal>='s3',
-                <literal>ORDINAL_POSITION</literal>=1,
-                <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>=NULL.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              One row with <literal>CONSTRAINT_NAME</literal>='PRIMARY',
+              <literal>TABLE_NAME</literal>='t1',
+              <literal>COLUMN_NAME</literal>='s3',
+              <literal>ORDINAL_POSITION</literal>=1,
+              <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>=NULL.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                One row with <literal>CONSTRAINT_NAME</literal>='CO',
-                <literal>TABLE_NAME</literal>='t3',
-                <literal>COLUMN_NAME</literal>='s2',
-                <literal>ORDINAL_POSITION</literal>=1,
-                <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>=1.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              One row with <literal>CONSTRAINT_NAME</literal>='CO',
+              <literal>TABLE_NAME</literal>='t3',
+              <literal>COLUMN_NAME</literal>='s2',
+              <literal>ORDINAL_POSITION</literal>=1,
+              <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal>=1.
+            </para>
+          </listitem>
 
-          </itemizedlist>
-        </listitem>
+        </itemizedlist>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="routines-table">
+  <section id="routines-table">
 
-      <title>&title-routines-table;</title>
+    <title>&title-routines-table;</title>
 
-      <indexterm type="function">
-        <primary>ROUTINES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>ROUTINES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>ROUTINES</literal> table provides information about
-        stored routines (both procedures and functions). The
-        <literal>ROUTINES</literal> table does not include user-defined
-        functions (UDFs) at this time.
-      </para>
+    <para>
+      The <literal>ROUTINES</literal> table provides information about
+      stored routines (both procedures and functions). The
+      <literal>ROUTINES</literal> table does not include user-defined
+      functions (UDFs) at this time.
+    </para>
 
-      <para>
-        The column named <quote><literal>mysql.proc</literal>
-        name</quote> indicates the <literal>mysql.proc</literal> table
-        column that corresponds to the
-        <literal>INFORMATION_SCHEMA.ROUTINES</literal> table column, if
-        any.
-      </para>
+    <para>
+      The column named <quote><literal>mysql.proc</literal> name</quote>
+      indicates the <literal>mysql.proc</literal> table column that
+      corresponds to the <literal>INFORMATION_SCHEMA.ROUTINES</literal>
+      table column, if any.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>mysql.proc</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>mysql.proc</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -2500,26 +2485,26 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SPECIFIC_NAME</literal></entry>
-              <entry><literal>specific_name</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_SCHEMA</literal></entry>
-              <entry><literal>db</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_NAME</literal></entry>
-              <entry><literal>name</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>SPECIFIC_NAME</literal></entry>
+            <entry><literal>specific_name</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_SCHEMA</literal></entry>
+            <entry><literal>db</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_NAME</literal></entry>
+            <entry><literal>name</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2586,51 +2571,51 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>ROUTINE_TYPE</literal></entry>
-              <entry><literal>type</literal></entry>
-              <entry><literal>{PROCEDURE|FUNCTION}</literal></entry>
-            </row>
-            <row>
-              <entry><literal>DTD_IDENTIFIER</literal></entry>
-              <entry/>
-              <entry>(data type descriptor)</entry>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_BODY</literal></entry>
-              <entry/>
-              <entry><literal>SQL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_DEFINITION</literal></entry>
-              <entry><literal>body</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>EXTERNAL_NAME</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>EXTERNAL_LANGUAGE</literal></entry>
-              <entry><literal>language</literal></entry>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>PARAMETER_STYLE</literal></entry>
-              <entry/>
-              <entry><literal>SQL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>IS_DETERMINISTIC</literal></entry>
-              <entry><literal>is_deterministic</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SQL_DATA_ACCESS</literal></entry>
-              <entry><literal>sql_data_access</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>ROUTINE_TYPE</literal></entry>
+            <entry><literal>type</literal></entry>
+            <entry><literal>{PROCEDURE|FUNCTION}</literal></entry>
+          </row>
+          <row>
+            <entry><literal>DTD_IDENTIFIER</literal></entry>
+            <entry/>
+            <entry>(data type descriptor)</entry>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_BODY</literal></entry>
+            <entry/>
+            <entry><literal>SQL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_DEFINITION</literal></entry>
+            <entry><literal>body</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>EXTERNAL_NAME</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>EXTERNAL_LANGUAGE</literal></entry>
+            <entry><literal>language</literal></entry>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>PARAMETER_STYLE</literal></entry>
+            <entry/>
+            <entry><literal>SQL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>IS_DETERMINISTIC</literal></entry>
+            <entry><literal>is_deterministic</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SQL_DATA_ACCESS</literal></entry>
+            <entry><literal>sql_data_access</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2642,11 +2627,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SQL_PATH</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
+          <row>
+            <entry><literal>SQL_PATH</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -2691,11 +2676,11 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SECURITY_TYPE</literal></entry>
-              <entry><literal>security_type</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>SECURITY_TYPE</literal></entry>
+            <entry><literal>security_type</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2740,16 +2725,16 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>CREATED</literal></entry>
-              <entry><literal>created</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>LAST_ALTERED</literal></entry>
-              <entry><literal>modified</literal></entry>
-              <entry/>
-            </row>
+          <row>
+            <entry><literal>CREATED</literal></entry>
+            <entry><literal>created</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>LAST_ALTERED</literal></entry>
+            <entry><literal>modified</literal></entry>
+            <entry/>
+          </row>
 <!--
          <row>
            <entry>
@@ -2794,127 +2779,127 @@
            </entry>
          </row>
          -->
-            <row>
-              <entry><literal>SQL_MODE</literal></entry>
-              <entry><literal>sql_mode</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>ROUTINE_COMMENT</literal></entry>
-              <entry><literal>comment</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-            <row>
-              <entry><literal>DEFINER</literal></entry>
-              <entry><literal>definer</literal></entry>
-              <entry>MySQL extension</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+          <row>
+            <entry><literal>SQL_MODE</literal></entry>
+            <entry><literal>sql_mode</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>ROUTINE_COMMENT</literal></entry>
+            <entry><literal>comment</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+          <row>
+            <entry><literal>DEFINER</literal></entry>
+            <entry><literal>definer</literal></entry>
+            <entry>MySQL extension</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            MySQL calculates <literal>EXTERNAL_LANGUAGE</literal> thus:
-          </para>
+      <listitem>
+        <para>
+          MySQL calculates <literal>EXTERNAL_LANGUAGE</literal> thus:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                If <literal>mysql.proc.language='SQL'</literal>, then
-                <literal>EXTERNAL_LANGUAGE</literal> is
-                <literal>NULL</literal>
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              If <literal>mysql.proc.language='SQL'</literal>, then
+              <literal>EXTERNAL_LANGUAGE</literal> is
+              <literal>NULL</literal>
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Otherwise, <literal>EXTERNAL_LANGUAGE</literal> is
-                what's in <literal>mysql.proc.language</literal>.
-                However, we don't have external languages yet, so it's
-                always <literal>NULL</literal>.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              Otherwise, <literal>EXTERNAL_LANGUAGE</literal> is what's
+              in <literal>mysql.proc.language</literal>. However, we
+              don't have external languages yet, so it's always
+              <literal>NULL</literal>.
+            </para>
+          </listitem>
 
-          </itemizedlist>
-        </listitem>
+        </itemizedlist>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="views-table">
+  <section id="views-table">
 
-      <title>&title-views-table;</title>
+    <title>&title-views-table;</title>
 
-      <indexterm type="function">
-        <primary>VIEWS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>VIEWS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>VIEWS</literal> table provides information about
-        views in databases.
-      </para>
+    <para>
+      The <literal>VIEWS</literal> table provides information about
+      views in databases.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>VIEW_DEFINITION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CHECK_OPTION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>IS_UPDATABLE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DEFINER</literal></entry>
-              <entry/>
-              <entry></entry>
-            </row>
-            <row>
-              <entry><literal>SECURITY_TYPE</literal></entry>
-              <entry/>
-              <entry></entry>
-            </row>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>VIEW_DEFINITION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CHECK_OPTION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>IS_UPDATABLE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DEFINER</literal></entry>
+            <entry/>
+            <entry></entry>
+          </row>
+          <row>
+            <entry><literal>SECURITY_TYPE</literal></entry>
+            <entry/>
+            <entry></entry>
+          </row>
 <!--
          <row>
            <entry>
@@ -2926,33 +2911,33 @@
            </entry>
          </row>
          -->
-          </tbody>
-        </tgroup>
-      </informaltable>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        Notes:
-      </para>
+    <para>
+      Notes:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            There is a new privilege, <literal>SHOW VIEW</literal>,
-            without which you cannot see the <literal>VIEWS</literal>
-            table.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          There is a new privilege, <literal>SHOW VIEW</literal>,
+          without which you cannot see the <literal>VIEWS</literal>
+          table.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>VIEW_DEFINITION</literal> column has most of
-            what you see in the <literal>Create Table</literal> field
-            that <literal>SHOW CREATE VIEW</literal> produces. Skip the
-            words before <literal>SELECT</literal> and skip the words
-            <literal>WITH CHECK OPTION</literal>. For example, if the
-            original statement was:
-          </para>
+      <listitem>
+        <para>
+          The <literal>VIEW_DEFINITION</literal> column has most of what
+          you see in the <literal>Create Table</literal> field that
+          <literal>SHOW CREATE VIEW</literal> produces. Skip the words
+          before <literal>SELECT</literal> and skip the words
+          <literal>WITH CHECK OPTION</literal>. For example, if the
+          original statement was:
+        </para>
 
 <programlisting>
 CREATE VIEW v AS
@@ -2962,315 +2947,315 @@
   WITH CHECK OPTION;
 </programlisting>
 
-          <para>
-            then the view definition is:
-          </para>
+        <para>
+          then the view definition is:
+        </para>
 
 <programlisting>
 SELECT s2,s1 FROM t WHERE s1 &gt; 5 ORDER BY s1
 </programlisting>
-        </listitem>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>CHECK_OPTION</literal> column always has a
-            value of <literal>NONE</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>CHECK_OPTION</literal> column always has a value
+          of <literal>NONE</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>IS_UPDATABLE</literal> column is
-            <literal>YES</literal> if the view is updatable,
-            <literal>NO</literal> if the view is not updatable.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>IS_UPDATABLE</literal> column is
+          <literal>YES</literal> if the view is updatable,
+          <literal>NO</literal> if the view is not updatable.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>DEFINER</literal> column indicates who defined
-            the view. <literal>SECURITY_TYPE</literal> has a value of
-            <literal>DEFINER</literal> or <literal>INVOKER</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>DEFINER</literal> column indicates who defined
+          the view. <literal>SECURITY_TYPE</literal> has a value of
+          <literal>DEFINER</literal> or <literal>INVOKER</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-    </section>
+  </section>
 
-    <section id="triggers-table">
+  <section id="triggers-table">
 
-      <title>&title-triggers-table;</title>
+    <title>&title-triggers-table;</title>
 
-      <indexterm type="function">
-        <primary>TRIGGERS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>TRIGGERS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>TRIGGERS</literal> table provides information about
-        triggers.
-      </para>
+    <para>
+      The <literal>TRIGGERS</literal> table provides information about
+      triggers.
+    </para>
 
-      <para>
-        You must have the <literal>SUPER</literal> privilege to view
-        this table.
-      </para>
+    <para>
+      You must have the <literal>SUPER</literal> privilege to view this
+      table.
+    </para>
 
-      <remark role="note">
-        Table schema as suggested by
-        http://lists.mysql.com/internals/25556: "TRIGGER_CATALOG",
-        NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0 "TRIGGER_SCHEMA", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 0, 0 "TRIGGER_NAME", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_MANIPULATION", 6,
-        MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_OBJECT_CATALOG", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 1, 0 "EVENT_OBJECT_SCHEMA", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_OBJECT_TABLE", NAME_LEN,
-        MYSQL_TYPE_STRING, 0, 0, 0 "ACTION_ORDER", 10, MYSQL_TYPE_LONG,
-        0, 1, 0 "ACTION_CONDITION", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0
-        "ACTION_STATEMENT", 65535, MYSQL_TYPE_STRING, 0, 0, 0
-        "ACTION_ORIENTATION", 3, MYSQL_TYPE_STRING, 0, 0, 0
-        "ACTION_TIMING", 6, MYSQL_TYPE_STRING, 0, 0, 0
-        "ACTION_REFERENCE_OLD_TABLE", NAME_LEN, MYSQL_TYPE_STRING, 0, 1,
-        0 "ACTION_REFERENCE_NEW_TABLE", NAME_LEN, MYSQL_TYPE_STRING, 0,
-        1, 0 "ACTION_REFERENCE_OLD_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0
-        "ACTION_REFERENCE_NEW_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0
-        "CREATED", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, 0 Additional info from
-        WL#1996.
-      </remark>
+    <remark role="note">
+      Table schema as suggested by
+      http://lists.mysql.com/internals/25556: "TRIGGER_CATALOG",
+      NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0 "TRIGGER_SCHEMA", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 0, 0 "TRIGGER_NAME", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_MANIPULATION", 6,
+      MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_OBJECT_CATALOG", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 1, 0 "EVENT_OBJECT_SCHEMA", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 0, 0 "EVENT_OBJECT_TABLE", NAME_LEN,
+      MYSQL_TYPE_STRING, 0, 0, 0 "ACTION_ORDER", 10, MYSQL_TYPE_LONG, 0,
+      1, 0 "ACTION_CONDITION", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0
+      "ACTION_STATEMENT", 65535, MYSQL_TYPE_STRING, 0, 0, 0
+      "ACTION_ORIENTATION", 3, MYSQL_TYPE_STRING, 0, 0, 0
+      "ACTION_TIMING", 6, MYSQL_TYPE_STRING, 0, 0, 0
+      "ACTION_REFERENCE_OLD_TABLE", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0
+      "ACTION_REFERENCE_NEW_TABLE", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, 0
+      "ACTION_REFERENCE_OLD_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0
+      "ACTION_REFERENCE_NEW_ROW", 3, MYSQL_TYPE_STRING, 0, 0, 0
+      "CREATED", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, 0 Additional info from
+      WL#1996.
+    </remark>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Standard Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TRIGGER_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>TRIGGER_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TRIGGER_NAME</literal></entry>
-              <entry><literal>Trigger</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>EVENT_MANIPULATION</literal></entry>
-              <entry><literal>Event</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>EVENT_OBJECT_CATALOG</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>EVENT_OBJECT_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>EVENT_OBJECT_TABLE</literal></entry>
-              <entry><literal>Table</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ACTION_ORDER</literal></entry>
-              <entry/>
-              <entry><literal>0</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_CONDITION</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_STATEMENT</literal></entry>
-              <entry><literal>Statement</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ACTION_ORIENTATION</literal></entry>
-              <entry/>
-              <entry><literal>ROW</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_TIMING</literal></entry>
-              <entry><literal>Timing</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>ACTION_REFERENCE_OLD_TABLE</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_REFERENCE_NEW_TABLE</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_REFERENCE_OLD_ROW</literal></entry>
-              <entry/>
-              <entry><literal>OLD</literal></entry>
-            </row>
-            <row>
-              <entry><literal>ACTION_REFERENCE_NEW_ROW</literal></entry>
-              <entry/>
-              <entry><literal>NEW</literal></entry>
-            </row>
-            <row>
-              <entry><literal>CREATED</literal></entry>
-              <entry/>
-              <entry><literal>NULL</literal> (<literal>0</literal>)</entry>
-            </row>
-            <row>
-              <entry><literal>SQL_MODE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DEFINER</literal></entry>
-              <entry/>
-              <entry></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Standard Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TRIGGER_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>TRIGGER_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TRIGGER_NAME</literal></entry>
+            <entry><literal>Trigger</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>EVENT_MANIPULATION</literal></entry>
+            <entry><literal>Event</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>EVENT_OBJECT_CATALOG</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>EVENT_OBJECT_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>EVENT_OBJECT_TABLE</literal></entry>
+            <entry><literal>Table</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ACTION_ORDER</literal></entry>
+            <entry/>
+            <entry><literal>0</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_CONDITION</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_STATEMENT</literal></entry>
+            <entry><literal>Statement</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ACTION_ORIENTATION</literal></entry>
+            <entry/>
+            <entry><literal>ROW</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_TIMING</literal></entry>
+            <entry><literal>Timing</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>ACTION_REFERENCE_OLD_TABLE</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_REFERENCE_NEW_TABLE</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_REFERENCE_OLD_ROW</literal></entry>
+            <entry/>
+            <entry><literal>OLD</literal></entry>
+          </row>
+          <row>
+            <entry><literal>ACTION_REFERENCE_NEW_ROW</literal></entry>
+            <entry/>
+            <entry><literal>NEW</literal></entry>
+          </row>
+          <row>
+            <entry><literal>CREATED</literal></entry>
+            <entry/>
+            <entry><literal>NULL</literal> (<literal>0</literal>)</entry>
+          </row>
+          <row>
+            <entry><literal>SQL_MODE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DEFINER</literal></entry>
+            <entry/>
+            <entry></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        <emphasis role="bold">Notes</emphasis>:
-      </para>
+    <para>
+      <emphasis role="bold">Notes</emphasis>:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            The <literal>TRIGGER_SCHEMA</literal> and
-            <literal>TRIGGER_NAME</literal> columns contain the name of
-            the database in which the trigger occurs, and the trigger
-            name, respectively.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>TRIGGER_SCHEMA</literal> and
+          <literal>TRIGGER_NAME</literal> columns contain the name of
+          the database in which the trigger occurs, and the trigger
+          name, respectively.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>EVENT_MANIPULATION</literal> column contains
-            one of the values <literal>'INSERT'</literal>,
-            <literal>'DELETE'</literal>, or <literal>'UPDATE'</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>EVENT_MANIPULATION</literal> column contains one
+          of the values <literal>'INSERT'</literal>,
+          <literal>'DELETE'</literal>, or <literal>'UPDATE'</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            As noted in <xref linkend="triggers"/>, every trigger is
-            associated with exactly one table. The
-            <literal>EVENT_OBJECT_SCHEMA</literal> and
-            <literal>EVENT_OBJECT_TABLE</literal> columns contain the
-            database in which this table occurs, and the table's name.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          As noted in <xref linkend="triggers"/>, every trigger is
+          associated with exactly one table. The
+          <literal>EVENT_OBJECT_SCHEMA</literal> and
+          <literal>EVENT_OBJECT_TABLE</literal> columns contain the
+          database in which this table occurs, and the table's name.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>ACTION_ORDER</literal> statement contains the
-            ordinal position of the trigger's action within the list of
-            all similar triggers on the same table. Currently, this
-            value is always <literal>0</literal>, because it is not
-            possible to have more than one trigger with the same
-            <literal>EVENT_MANIPULATION</literal> and
-            <literal>ACTION_TIMING</literal> on the same table.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ACTION_ORDER</literal> statement contains the
+          ordinal position of the trigger's action within the list of
+          all similar triggers on the same table. Currently, this value
+          is always <literal>0</literal>, because it is not possible to
+          have more than one trigger with the same
+          <literal>EVENT_MANIPULATION</literal> and
+          <literal>ACTION_TIMING</literal> on the same table.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>ACTION_STATEMENT</literal> column contains the
-            statement to be executed when the trigger is invoked. This
-            is the same as the text displayed in the
-            <literal>Statement</literal> column of the output from
-            <literal>SHOW TRIGGERS</literal>. Note that this text uses
-            UTF-8 encoding.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ACTION_STATEMENT</literal> column contains the
+          statement to be executed when the trigger is invoked. This is
+          the same as the text displayed in the
+          <literal>Statement</literal> column of the output from
+          <literal>SHOW TRIGGERS</literal>. Note that this text uses
+          UTF-8 encoding.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>ACTION_ORIENTATION</literal> column always
-            contains the value <literal>'ROW'</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ACTION_ORIENTATION</literal> column always
+          contains the value <literal>'ROW'</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>ACTION_TIMING</literal> column contains one of
-            the two values <literal>'BEFORE'</literal> or
-            <literal>'AFTER'</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ACTION_TIMING</literal> column contains one of
+          the two values <literal>'BEFORE'</literal> or
+          <literal>'AFTER'</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The columns <literal>ACTION_REFERENCE_OLD_ROW</literal> and
-            <literal>ACTION_REFERENCE_NEW_ROW</literal> contain the old
-            and new column identifiers, respectively. This means that
-            <literal>ACTION_REFERENCE_OLD_ROW</literal> always contains
-            the value <literal>'OLD'</literal> and
-            <literal>ACTION_REFERENCE_NEW_ROW</literal> always contains
-            the value <literal>'NEW'</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The columns <literal>ACTION_REFERENCE_OLD_ROW</literal> and
+          <literal>ACTION_REFERENCE_NEW_ROW</literal> contain the old
+          and new column identifiers, respectively. This means that
+          <literal>ACTION_REFERENCE_OLD_ROW</literal> always contains
+          the value <literal>'OLD'</literal> and
+          <literal>ACTION_REFERENCE_NEW_ROW</literal> always contains
+          the value <literal>'NEW'</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>SQL_MODE</literal> column shows the server SQL
-            mode that was in effect at the time when the trigger was
-            created (and thus which remains in effect for this trigger
-            whenever it is invoked, <emphasis>regardless of the current
-            server SQL mode</emphasis>). The possible range of values
-            for this column is the same as that of the
-            <literal>sql_mode</literal> system variable. See
-            <xref linkend="server-sql-mode"/>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>SQL_MODE</literal> column shows the server SQL
+          mode that was in effect at the time when the trigger was
+          created (and thus which remains in effect for this trigger
+          whenever it is invoked, <emphasis>regardless of the current
+          server SQL mode</emphasis>). The possible range of values for
+          this column is the same as that of the
+          <literal>sql_mode</literal> system variable. See
+          <xref linkend="server-sql-mode"/>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The <literal>DEFINER</literal> column was added in MySQL
-            5.1.2. <literal>DEFINER</literal> indicates who defined the
-            trigger.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>DEFINER</literal> column was added in MySQL
+          5.1.2. <literal>DEFINER</literal> indicates who defined the
+          trigger.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            The following columns currently always contain
-            <literal>NULL</literal>: <literal>TRIGGER_CATALOG</literal>,
-            <literal>EVENT_OBJECT_CATALOG</literal>,
-            <literal>ACTION_CONDITION</literal>,
-            <literal>ACTION_REFERENCE_OLD_TABLE</literal>,
-            <literal>ACTION_REFERENCE_NEW_TABLE</literal>, and
-            <literal>CREATED</literal>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The following columns currently always contain
+          <literal>NULL</literal>: <literal>TRIGGER_CATALOG</literal>,
+          <literal>EVENT_OBJECT_CATALOG</literal>,
+          <literal>ACTION_CONDITION</literal>,
+          <literal>ACTION_REFERENCE_OLD_TABLE</literal>,
+          <literal>ACTION_REFERENCE_NEW_TABLE</literal>, and
+          <literal>CREATED</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        Example, using the <literal>ins_sum</literal> trigger defined in
-        <xref linkend="using-triggers"/>:
-      </para>
+    <para>
+      Example, using the <literal>ins_sum</literal> trigger defined in
+      <xref linkend="using-triggers"/>:
+    </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT * FROM INFORMATION_SCHEMA.TRIGGERS\G</userinput>
@@ -3295,390 +3280,385 @@
 1 row in set (1.54 sec)
 </programlisting>
 
-      <para>
-        See also <xref linkend="show-triggers"/>.
-      </para>
+    <para>
+      See also <xref linkend="show-triggers"/>.
+    </para>
 
-    </section>
+  </section>
 
-    <section id="plugins-table">
+  <section id="plugins-table">
 
-      <title>&title-plugins-table;</title>
+    <title>&title-plugins-table;</title>
 
-      <indexterm type="function">
-        <primary>PLUGINS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>PLUGINS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>PLUGINS</literal> table provides information about
-        server plugins.
-      </para>
+    <para>
+      The <literal>PLUGINS</literal> table provides information about
+      server plugins.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_VERSION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_STATUS</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_TYPE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_TYPE_VERSION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_LIBRARY</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_LIBRARY_VERSION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_AUTHOR</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PLUGIN_DESCRIPTION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_VERSION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_STATUS</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_TYPE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_TYPE_VERSION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_LIBRARY</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_LIBRARY_VERSION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_AUTHOR</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PLUGIN_DESCRIPTION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        <emphasis role="bold">Notes</emphasis>:
-      </para>
+    <para>
+      <emphasis role="bold">Notes</emphasis>:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            The <literal>PLUGINS</literal> table was added in MySQL
-            5.1.5.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>PLUGINS</literal> table was added in MySQL 5.1.5.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <remark role="todo">
-        Add xref to SHOW PLUGINS when that is implemented.
-      </remark>
+    <remark role="todo">
+      Add xref to SHOW PLUGINS when that is implemented.
+    </remark>
 
-    </section>
+  </section>
 
-    <section id="engines-table">
+  <section id="engines-table">
 
-      <title>&title-engines-table;</title>
+    <title>&title-engines-table;</title>
 
-      <indexterm type="function">
-        <primary>ENGINES</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>ENGINES</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>PLUGINS</literal> table provides information about
-        storage engines.
-      </para>
+    <para>
+      The <literal>PLUGINS</literal> table provides information about
+      storage engines.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>ENGINE</literal></entry>
-              <entry><literal>Engine</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SUPPORT</literal></entry>
-              <entry><literal>Support</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>COMMENT</literal></entry>
-              <entry><literal>Comment</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TRANSACTIONS</literal></entry>
-              <entry><literal>Transactions</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>XA</literal></entry>
-              <entry><literal>XA</literal></entry>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SAVEPOINTS</literal></entry>
-              <entry><literal>Savepoints</literal></entry>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>ENGINE</literal></entry>
+            <entry><literal>Engine</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SUPPORT</literal></entry>
+            <entry><literal>Support</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>COMMENT</literal></entry>
+            <entry><literal>Comment</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TRANSACTIONS</literal></entry>
+            <entry><literal>Transactions</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>XA</literal></entry>
+            <entry><literal>XA</literal></entry>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SAVEPOINTS</literal></entry>
+            <entry><literal>Savepoints</literal></entry>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        <emphasis role="bold">Notes</emphasis>:
-      </para>
+    <para>
+      <emphasis role="bold">Notes</emphasis>:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            The <literal>ENGINES</literal> table was added in MySQL
-            5.1.5.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>ENGINES</literal> table was added in MySQL 5.1.5.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <para>
-        See also <xref linkend="show-engines"/>.
-      </para>
+    <para>
+      See also <xref linkend="show-engines"/>.
+    </para>
 
-    </section>
+  </section>
 
-    <section id="partitions-table">
+  <section id="partitions-table">
 
-      <title>&title-partitions-table;</title>
+    <title>&title-partitions-table;</title>
 
-      <indexterm type="function">
-        <primary>PARTITIONS</primary>
-        <secondary>INFORMATION_SCHEMA table</secondary>
-      </indexterm>
+    <indexterm type="function">
+      <primary>PARTITIONS</primary>
+      <secondary>INFORMATION_SCHEMA table</secondary>
+    </indexterm>
 
-      <para>
-        The <literal>PARTITIONS</literal> table provides information
-        about table partitions.
-      </para>
+    <para>
+      The <literal>PARTITIONS</literal> table provides information about
+      table partitions.
+    </para>
 
-      <informaltable>
-        <tgroup cols="3">
-          <colspec colwidth="40*"/>
-          <colspec colwidth="30*"/>
-          <colspec colwidth="30*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Name</emphasis></entry>
-              <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
-              <entry><emphasis role="bold">Remarks</emphasis></entry>
-            </row>
-            <row>
-              <entry><literal>TABLE_CATALOG</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_SCHEMA</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PARTITION_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SUBPARTITION_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PARTITION_ORDINAL_POSITION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SUBPARTITION_ORDINAL_POSITION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PARTITION_METHOD</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SUBPARTITION_METHOD</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PARTITION_EXPRESSION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>SUBPARTITION_EXPRESSION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PARTITION_DESCRIPTION</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLE_ROWS</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>AVG_ROW_LENGTH</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DATA_LENGTH</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>MAX_DATA_LENGTH</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>INDEX_LENGTH</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>DATA_FREE</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CREATE_TIME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>UPDATE_TIME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CHECK_TIME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>CHECKSUM</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>PARTITION_COMMENT</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>NODEGROUP</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-            <row>
-              <entry><literal>TABLESPACE_NAME</literal></entry>
-              <entry/>
-              <entry/>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+    <informaltable>
+      <tgroup cols="3">
+        <colspec colwidth="40*"/>
+        <colspec colwidth="30*"/>
+        <colspec colwidth="30*"/>
+        <tbody>
+          <row>
+            <entry><emphasis role="bold">Name</emphasis></entry>
+            <entry><emphasis role="bold"><literal>SHOW</literal> name</emphasis></entry>
+            <entry><emphasis role="bold">Remarks</emphasis></entry>
+          </row>
+          <row>
+            <entry><literal>TABLE_CATALOG</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_SCHEMA</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PARTITION_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SUBPARTITION_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PARTITION_ORDINAL_POSITION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SUBPARTITION_ORDINAL_POSITION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PARTITION_METHOD</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SUBPARTITION_METHOD</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PARTITION_EXPRESSION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>SUBPARTITION_EXPRESSION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PARTITION_DESCRIPTION</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLE_ROWS</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>AVG_ROW_LENGTH</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DATA_LENGTH</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>MAX_DATA_LENGTH</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>INDEX_LENGTH</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>DATA_FREE</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CREATE_TIME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>UPDATE_TIME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CHECK_TIME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>CHECKSUM</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>PARTITION_COMMENT</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>NODEGROUP</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+          <row>
+            <entry><literal>TABLESPACE_NAME</literal></entry>
+            <entry/>
+            <entry/>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
 
-      <para>
-        <emphasis role="bold">Notes</emphasis>:
-      </para>
+    <para>
+      <emphasis role="bold">Notes</emphasis>:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            The <literal>PARTITIONS</literal> table was added in MySQL
-            5.1.6.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The <literal>PARTITIONS</literal> table was added in MySQL
+          5.1.6.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <emphasis role="bold">Important</emphasis>: If any
-            partitioned tables created in a MySQL version prior to MySQL
-            5.1.6 are present following an upgrade to MySQL 5.1.6 or
-            later, it is not possible to <literal>SELECT</literal> from,
-            <literal>SHOW</literal>, or <literal>DESCRIBE</literal> the
-            <literal>PARTITIONS</literal> table. See
-            <xref linkend="news-5-1-6"/> <emphasis>before</emphasis>
-            upgrading from MySQL 5.1.5 or earlier to MySQL 5.1.6 or
-            later.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">Important</emphasis>: If any partitioned
+          tables created in a MySQL version prior to MySQL 5.1.6 are
+          present following an upgrade to MySQL 5.1.6 or later, it is
+          not possible to <literal>SELECT</literal> from,
+          <literal>SHOW</literal>, or <literal>DESCRIBE</literal> the
+          <literal>PARTITIONS</literal> table. See
+          <xref linkend="news-5-1-6"/> <emphasis>before</emphasis>
+          upgrading from MySQL 5.1.5 or earlier to MySQL 5.1.6 or later.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
-      <remark role="todo">
-        Add xref to SHOW PARTITIONS when that is implemented.
-      </remark>
+    <remark role="todo">
+      Add xref to SHOW PARTITIONS when that is implemented.
+    </remark>
 
-    </section>
+  </section>
 
-    <section id="other-information-schema-tables">
+  <section id="other-information-schema-tables">
 
-      <title>&title-other-information-schema-tables;</title>
+    <title>&title-other-information-schema-tables;</title>
 
-      <para>
-        We intend to implement additional
-        <literal>INFORMATION_SCHEMA</literal> tables. In particular, we
-        acknowledge the need for
-        <literal>INFORMATION_SCHEMA.PARAMETERS</literal> and for
-        <literal>INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS</literal>.
-      </para>
+    <para>
+      We intend to implement additional
+      <literal>INFORMATION_SCHEMA</literal> tables. In particular, we
+      acknowledge the need for
+      <literal>INFORMATION_SCHEMA.PARAMETERS</literal> and for
+      <literal>INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS</literal>.
+    </para>
 
-    </section>
-
   </section>
 
   <section id="extended-show">

Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2006-01-28 23:48:21 UTC (rev 1093)
+++ trunk/refman-5.1/renamed-nodes.txt	2006-01-29 01:03:24 UTC (rev 1094)
@@ -114,3 +114,4 @@
 silent-column-changes ../../5.0/en/silent-column-changes
 secure-grant grant
 secure-requirements secure-using-openssl
+information-schema-tables information-schema

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-28 23:48:21 UTC (rev 1093)
+++ trunk/refman-common/titles.en.ent	2006-01-29 01:03:24 UTC (rev 1094)
@@ -460,7 +460,6 @@
 <!ENTITY title-indexes "Column Indexes">
 <!ENTITY title-information-functions "Information Functions">
 <!ENTITY title-information-schema "The <literal>INFORMATION_SCHEMA</literal> Database">
-<!ENTITY title-information-schema-tables "<literal>INFORMATION_SCHEMA</literal> Tables">
 <!ENTITY title-information-sources "MySQL Information Sources">
 <!ENTITY title-innodb "The <literal>InnoDB</literal> Storage Engine">
 <!ENTITY title-innodb-adaptive-hash "Adaptive Hash Indexes">

Thread
svn commit - mysqldoc@docsrva: r1094 - in trunk: . refman-5.0 refman-5.1 refman-commonpaul29 Jan