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

Log:
 r6841@frost:  paul | 2006-01-28 19:02:57 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-5.0/information-schema.xml
   trunk/refman-5.1/information-schema.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6840
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6841
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-29 01:03:24 UTC (rev 1094)
+++ trunk/refman-5.0/information-schema.xml	2006-01-29 01:03:44 UTC (rev 1095)
@@ -49,6 +49,15 @@
   </para>
 
   <para>
+    <literal>INFORMATION_SCHEMA</literal> is the information database,
+    the place that stores information about all the other databases that
+    the MySQL server maintains. Inside
+    <literal>INFORMATION_SCHEMA</literal> there are several read-only
+    tables. They are actually views, not base tables, so you will not
+    actually see any file associated with them.
+  </para>
+
+  <para>
     Here is an example:
   </para>
 
@@ -85,30 +94,16 @@
     Explanation: The statement requests a list of all the tables in
     database <literal>db5</literal>, in reverse alphabetical order,
     showing just three pieces of information: the name of the table, its
-    type, and its engine.
+    type, and its storage engine.
   </para>
 
   <para>
-    <literal>INFORMATION_SCHEMA</literal> is the information database,
-    the place that stores information about all the other databases that
-    the MySQL server maintains. Inside
-    <literal>INFORMATION_SCHEMA</literal> there are several read-only
-    tables. They are actually views, not base tables, so you won't
-    actually see any file associated with them.
-  </para>
-
-  <para>
     Each MySQL user has the right to access these tables, but only the
     rows in the tables that correspond to objects for which the user has
     the proper access privileges.
   </para>
 
   <para>
-    <emphasis role="bold">Advantages of
-    <literal>SELECT</literal></emphasis>
-  </para>
-
-  <para>
     The <literal>SELECT ... FROM INFORMATION_SCHEMA</literal> statement
     is intended as a more consistent way to provide access to the
     information provided by the various <literal>SHOW</literal>
@@ -168,7 +163,11 @@
   </para>
 
   <para>
-    <emphasis role="bold">Standards</emphasis>
+    There is no difference between the privileges required for
+    <literal>SHOW</literal> statements and those required to select
+    information from <literal>INFORMATION_SCHEMA</literal>. In either
+    case, you have to have some privilege on an object in order to see
+    information about it.
   </para>
 
   <para>
@@ -183,46 +182,32 @@
     Users of SQL Server 2000 (which also follows the standard) may
     notice a strong similarity. However, MySQL has omitted many columns
     that are not relevant for our implementation, and added columns that
-    are MySQL-specific. One such column is the <literal>engine</literal>
+    are MySQL-specific. One such column is the <literal>ENGINE</literal>
     column in the <literal>INFORMATION_SCHEMA.TABLES</literal> table.
   </para>
 
   <para>
-    Although other DBMSs use a variety of names, like syscat or system,
-    the standard name is <literal>INFORMATION_SCHEMA</literal>.
+    Although other DBMSs use a variety of names, like
+    <literal>syscat</literal> or <literal>system</literal>, the standard
+    name is <literal>INFORMATION_SCHEMA</literal>.
   </para>
 
   <para>
-    In effect, we have a new database named
-    <literal>INFORMATION_SCHEMA</literal>, although there is never a
-    need to make a file by that name. It is possible to select
+    In effect, we have a database named
+    <literal>INFORMATION_SCHEMA</literal>, although the server does not
+    create a database directory with that name. It is possible to select
     <literal>INFORMATION_SCHEMA</literal> as the default database with a
-    <literal>USE</literal> statement, but the only way to access the
-    contents of its tables is with <literal>SELECT</literal>. You cannot
-    insert into them, update them, or delete from them.
+    <literal>USE</literal> statement, but it is possible only to read
+    the contents of tables. You cannot insert into them, update them, or
+    delete from them.
   </para>
 
   <para>
-    <emphasis role="bold">Privileges</emphasis>
+    The following sections describe each of the tables and columns that
+    are in <literal>INFORMATION_SCHEMA</literal>. For each column, there
+    are three pieces of information:
   </para>
 
-  <para>
-    There is no difference between the current (<literal>SHOW</literal>)
-    privilege requirement and the <literal>SELECT</literal> requirement.
-    In either case, you have to have some privilege on an object in
-    order to see information about it.
-  </para>
-
-  <para>
-    <emphasis role="bold">Explanation of following sections</emphasis>
-  </para>
-
-  <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>
-
   <itemizedlist>
 
     <listitem>
@@ -243,7 +228,8 @@
     <listitem>
       <para>
         <quote>Remarks</quote> provides additional information where
-        applicable.
+        applicable. If this field is <literal>NULL</literal>, it means
+        that the value of the column is always <literal>NULL</literal>.
 
         <remark>
           We have marked ``omit'' those columns for which MySQL has no
@@ -259,10 +245,10 @@
   <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:
+    <quote>MySQL extension</quote>. (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>
 
@@ -276,14 +262,14 @@
   <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.
+    from <literal>INFORMATION_SCHEMA</literal>, if there is such a
+    statement.
   </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.
+    this and update the documentation as changes are made.
   </para>
 
   <section id="schemata-table">
@@ -381,14 +367,6 @@
 
       <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>
@@ -401,12 +379,12 @@
     </para>
 
 <programlisting>
-SELECT SCHEMA_NAME AS `Database
-    FROM INFORMATION_SCHEMA.SCHEMATA
-    [WHERE SCHEMA_NAME LIKE 'wild']
+SELECT SCHEMA_NAME AS `Database`
+  FROM INFORMATION_SCHEMA.SCHEMATA
+  [WHERE SCHEMA_NAME LIKE '<replaceable>wild</replaceable>']
 
 SHOW DATABASES
-    [LIKE 'wild']
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -667,12 +645,12 @@
 
 <programlisting>
 SELECT table_name FROM INFORMATION_SCHEMA.TABLES
-  [WHERE table_schema = 'db_name']
-  [WHERE|AND table_name LIKE 'wild']
+  [WHERE table_schema = '<replaceable>db_name</replaceable>']
+  [WHERE|AND table_name LIKE '<replaceable>wild</replaceable>']
 
 SHOW TABLES
-  [FROM db_name]
-  [LIKE 'wild']
+  [FROM <replaceable>db_name</replaceable>]
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -1144,14 +1122,14 @@
 <programlisting>
 SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT
   FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'tbl_name'
-  [AND table_schema = 'db_name']
-  [AND column_name LIKE 'wild']
+  WHERE table_name = '<replaceable>tbl_name</replaceable>'
+  [AND table_schema = '<replaceable>db_name</replaceable>']
+  [AND column_name LIKE '<replaceable>wild</replaceable>']
 
 SHOW COLUMNS
-  FROM tbl_name
-  [FROM db_name]
-  [LIKE wild]
+  FROM <replaceable>tbl_name</replaceable>
+  [FROM <replaceable>db_name</replaceable>]
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -1324,12 +1302,12 @@
 
 <programlisting>
 SELECT * FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'tbl_name'
-  [AND table_schema = 'db_name']
+  WHERE table_name = '<replaceable>tbl_name</replaceable>'
+  [AND table_schema = '<replaceable>db_name</replaceable>']
 
 SHOW INDEX
-  FROM tbl_name
-  [FROM db_name]
+  FROM <replaceable>tbl_name</replaceable>
+  [FROM <replaceable>db_name</replaceable>]
 </programlisting>
 
   </section>
@@ -1363,7 +1341,8 @@
           <row>
             <entry><literal>GRANTEE</literal></entry>
             <entry/>
-            <entry>e.g. 'user'@'host'</entry>
+            <entry><literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
+              value</entry>
           </row>
           <row>
             <entry><literal>TABLE_CATALOG</literal></entry>
@@ -1430,7 +1409,8 @@
           <row>
             <entry><literal>GRANTEE</literal></entry>
             <entry/>
-            <entry>e.g. 'user'@'host'</entry>
+            <entry><literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
+              value</entry>
           </row>
           <row>
             <entry><literal>TABLE_CATALOG</literal></entry>
@@ -1513,7 +1493,8 @@
           <row>
             <entry><literal>GRANTEE</literal></entry>
             <entry/>
-            <entry>e.g. 'user'@'host'</entry>
+            <entry><literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
+              value</entry>
           </row>
           <row>
             <entry><literal>TABLE_CATALOG</literal></entry>
@@ -1616,7 +1597,8 @@
           <row>
             <entry><literal>GRANTEE</literal></entry>
             <entry/>
-            <entry>e.g. 'user'@'host'</entry>
+            <entry><literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
+              value</entry>
           </row>
           <row>
             <entry><literal>TABLE_CATALOG</literal></entry>
@@ -1663,8 +1645,8 @@
           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.
+          <literal>COLUMN_PRIVILEGES</literal>, there is one privilege
+          per row, in uppercase.
         </para>
       </listitem>
 
@@ -1851,10 +1833,10 @@
 
 <programlisting>
 SELECT * FROM INFORMATION_SCHEMA.CHARACTER_SETS
-  [WHERE name LIKE 'wild']
+  [WHERE name LIKE '<replaceable>wild</replaceable>']
 
 SHOW CHARACTER SET
-  [LIKE 'wild']
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -2038,10 +2020,10 @@
 
 <programlisting>
 SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS
-  [WHERE collation_name LIKE 'wild']
+  [WHERE collation_name LIKE '<replaceable>wild</replaceable>']
 
 SHOW COLLATION
-  [LIKE 'wild']
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -2419,21 +2401,27 @@
 
           <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.
+              One row with <literal>CONSTRAINT_NAME</literal> =
+              <literal>'PRIMARY'</literal>,
+              <literal>TABLE_NAME</literal> = <literal>'t1'</literal>,
+              <literal>COLUMN_NAME</literal> = <literal>'s3'</literal>,
+              <literal>ORDINAL_POSITION</literal> =
+              <literal>1</literal>,
+              <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal> =
+              <literal>NULL</literal>.
             </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.
+              One row with <literal>CONSTRAINT_NAME</literal> =
+              <literal>'CO'</literal>, <literal>TABLE_NAME</literal> =
+              <literal>'t3'</literal>, <literal>COLUMN_NAME</literal> =
+              <literal>'s2'</literal>,
+              <literal>ORDINAL_POSITION</literal> =
+              <literal>1</literal>,
+              <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal> =
+              <literal>1</literal>.
             </para>
           </listitem>
 
@@ -2839,7 +2827,7 @@
 
           <listitem>
             <para>
-              If <literal>mysql.proc.language='SQL'</literal>, then
+              If <literal>mysql.proc.language='SQL'</literal>,
               <literal>EXTERNAL_LANGUAGE</literal> is
               <literal>NULL</literal>
             </para>
@@ -2847,9 +2835,9 @@
 
           <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
+              Otherwise, <literal>EXTERNAL_LANGUAGE</literal> is what is
+              in <literal>mysql.proc.language</literal>. However, we do
+              not have external languages yet, so it is always
               <literal>NULL</literal>.
             </para>
           </listitem>
@@ -2872,7 +2860,8 @@
 
     <para>
       The <literal>VIEWS</literal> table provides information about
-      views in databases.
+      views in databases. You must have the <literal>SHOW VIEW</literal>
+      privilege to access this table.
     </para>
 
     <informaltable>
@@ -2949,19 +2938,11 @@
 
       <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
+          <literal>WITH CHECK OPTION</literal>. Suppose that the
           original statement was:
         </para>
 
@@ -2974,7 +2955,7 @@
 </programlisting>
 
         <para>
-          then the view definition is:
+          Then the view definition looks like this:
         </para>
 
 <programlisting>
@@ -3022,18 +3003,10 @@
 
     <para>
       The <literal>TRIGGERS</literal> table provides information about
-      triggers.
+      triggers. You must have the <literal>SUPER</literal> privilege to
+      access this table.
     </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>
-
     <remark role="note">
       Table schema as suggested by
       http://lists.mysql.com/internals/25556: "TRIGGER_CATALOG",
@@ -3174,6 +3147,13 @@
 
       <listitem>
         <para>
+          The <literal>TRIGGERS</literal> table was added in MySQL
+          5.0.10.
+        </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
@@ -3301,7 +3281,7 @@
         EVENT_OBJECT_TABLE: account
               ACTION_ORDER: 0
           ACTION_CONDITION: NULL
-          ACTION_STATEMENT:  SET @sum = @sum + NEW.amount
+          ACTION_STATEMENT: SET @sum = @sum + NEW.amount
         ACTION_ORIENTATION: ROW
              ACTION_TIMING: BEFORE
 ACTION_REFERENCE_OLD_TABLE: NULL
@@ -3309,7 +3289,8 @@
   ACTION_REFERENCE_OLD_ROW: OLD
   ACTION_REFERENCE_NEW_ROW: NEW
                    CREATED: NULL
-1 row in set (1.54 sec)
+                  SQL_MODE:
+                   DEFINER: me@localhost
 </programlisting>
 
     <para>
@@ -3325,9 +3306,8 @@
     <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>.
+      acknowledge the need for the <literal>PARAMETERS</literal> and
+      <literal>REFERENTIAL_CONSTRAINTS</literal> tables.
     </para>
 
   </section>
@@ -3404,8 +3384,8 @@
 | TABLE_CONSTRAINTS                     |
 | TABLE_PRIVILEGES                      |
 | TRIGGERS                              |
-| VIEWS                                 |
 | USER_PRIVILEGES                       |
+| VIEWS                                 |
 +---------------------------------------+
 16 rows in set (0.02 sec)
 </programlisting>
@@ -3455,7 +3435,6 @@
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |      1 |
 | latin1   | cp1252 West European        | latin1_swedish_ci   |      1 |
 | latin2   | ISO 8859-2 Central European | latin2_general_ci   |      1 |
-
 ...
 </programlisting>
 
@@ -3464,7 +3443,7 @@
       CHARACTER SET</literal>, you would refer to those column names. As
       an example, the following statement displays information about
       character sets for which the default collation contains the string
-      <literal>"japanese"</literal>:
+      <literal>'japanese'</literal>:
     </para>
 
 <programlisting>

Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml	2006-01-29 01:03:24 UTC (rev 1094)
+++ trunk/refman-5.1/information-schema.xml	2006-01-29 01:03:44 UTC (rev 1095)
@@ -49,6 +49,15 @@
   </para>
 
   <para>
+    <literal>INFORMATION_SCHEMA</literal> is the information database,
+    the place that stores information about all the other databases that
+    the MySQL server maintains. Inside
+    <literal>INFORMATION_SCHEMA</literal> there are several read-only
+    tables. They are actually views, not base tables, so you will not
+    actually see any file associated with them.
+  </para>
+
+  <para>
     Here is an example:
   </para>
 
@@ -85,30 +94,16 @@
     Explanation: The statement requests a list of all the tables in
     database <literal>db5</literal>, in reverse alphabetical order,
     showing just three pieces of information: the name of the table, its
-    type, and its engine.
+    type, and its storage engine.
   </para>
 
   <para>
-    <literal>INFORMATION_SCHEMA</literal> is the information database,
-    the place that stores information about all the other databases that
-    the MySQL server maintains. Inside
-    <literal>INFORMATION_SCHEMA</literal> there are several read-only
-    tables. They are actually views, not base tables, so you won't
-    actually see any file associated with them.
-  </para>
-
-  <para>
     Each MySQL user has the right to access these tables, but only the
     rows in the tables that correspond to objects for which the user has
     the proper access privileges.
   </para>
 
   <para>
-    <emphasis role="bold">Advantages of
-    <literal>SELECT</literal></emphasis>
-  </para>
-
-  <para>
     The <literal>SELECT ... FROM INFORMATION_SCHEMA</literal> statement
     is intended as a more consistent way to provide access to the
     information provided by the various <literal>SHOW</literal>
@@ -168,7 +163,11 @@
   </para>
 
   <para>
-    <emphasis role="bold">Standards</emphasis>
+    There is no difference between the privileges required for
+    <literal>SHOW</literal> statements and those required to select
+    information from <literal>INFORMATION_SCHEMA</literal>. In either
+    case, you have to have some privilege on an object in order to see
+    information about it.
   </para>
 
   <para>
@@ -183,46 +182,32 @@
     Users of SQL Server 2000 (which also follows the standard) may
     notice a strong similarity. However, MySQL has omitted many columns
     that are not relevant for our implementation, and added columns that
-    are MySQL-specific. One such column is the <literal>engine</literal>
+    are MySQL-specific. One such column is the <literal>ENGINE</literal>
     column in the <literal>INFORMATION_SCHEMA.TABLES</literal> table.
   </para>
 
   <para>
-    Although other DBMSs use a variety of names, like syscat or system,
-    the standard name is <literal>INFORMATION_SCHEMA</literal>.
+    Although other DBMSs use a variety of names, like
+    <literal>syscat</literal> or <literal>system</literal>, the standard
+    name is <literal>INFORMATION_SCHEMA</literal>.
   </para>
 
   <para>
-    In effect, we have a new database named
-    <literal>INFORMATION_SCHEMA</literal>, although there is never a
-    need to make a file by that name. It is possible to select
+    In effect, we have a database named
+    <literal>INFORMATION_SCHEMA</literal>, although the server does not
+    create a database directory with that name. It is possible to select
     <literal>INFORMATION_SCHEMA</literal> as the default database with a
-    <literal>USE</literal> statement, but the only way to access the
-    contents of its tables is with <literal>SELECT</literal>. You cannot
-    insert into them, update them, or delete from them.
+    <literal>USE</literal> statement, but it is possible only to read
+    the contents of tables. You cannot insert into them, update them, or
+    delete from them.
   </para>
 
   <para>
-    <emphasis role="bold">Privileges</emphasis>
+    The following sections describe each of the tables and columns that
+    are in <literal>INFORMATION_SCHEMA</literal>. For each column, there
+    are three pieces of information:
   </para>
 
-  <para>
-    There is no difference between the current (<literal>SHOW</literal>)
-    privilege requirement and the <literal>SELECT</literal> requirement.
-    In either case, you have to have some privilege on an object in
-    order to see information about it.
-  </para>
-
-  <para>
-    <emphasis role="bold">Explanation of following sections</emphasis>
-  </para>
-
-  <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>
-
   <itemizedlist>
 
     <listitem>
@@ -243,7 +228,8 @@
     <listitem>
       <para>
         <quote>Remarks</quote> provides additional information where
-        applicable.
+        applicable. If this field is <literal>NULL</literal>, it means
+        that the value of the column is always <literal>NULL</literal>.
 
         <remark>
           We have marked ``omit'' those columns for which MySQL has no
@@ -259,10 +245,10 @@
   <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:
+    <quote>MySQL extension</quote>. (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>
 
@@ -276,14 +262,14 @@
   <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.
+    from <literal>INFORMATION_SCHEMA</literal>, if there is such a
+    statement.
   </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.
+    this and update the documentation as changes are made.
   </para>
 
   <section id="schemata-table">
@@ -374,22 +360,16 @@
     </informaltable>
 
     <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>
 
 <programlisting>
-SELECT SCHEMA_NAME AS `Database
-    FROM INFORMATION_SCHEMA.SCHEMATA
-    [WHERE SCHEMA_NAME LIKE 'wild']
+SELECT SCHEMA_NAME AS `Database`
+  FROM INFORMATION_SCHEMA.SCHEMATA
+  [WHERE SCHEMA_NAME LIKE '<replaceable>wild</replaceable>']
 
 SHOW DATABASES
-    [LIKE 'wild']
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -650,12 +630,12 @@
 
 <programlisting>
 SELECT table_name FROM INFORMATION_SCHEMA.TABLES
-  [WHERE table_schema = 'db_name']
-  [WHERE|AND table_name LIKE 'wild']
+  [WHERE table_schema = '<replaceable>db_name</replaceable>']
+  [WHERE|AND table_name LIKE '<replaceable>wild</replaceable>']
 
 SHOW TABLES
-  [FROM db_name]
-  [LIKE 'wild']
+  [FROM <replaceable>db_name</replaceable>]
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -1127,14 +1107,14 @@
 <programlisting>
 SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT
   FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'tbl_name'
-  [AND table_schema = 'db_name']
-  [AND column_name LIKE 'wild']
+  WHERE table_name = '<replaceable>tbl_name</replaceable>'
+  [AND table_schema = '<replaceable>db_name</replaceable>']
+  [AND column_name LIKE '<replaceable>wild</replaceable>']
 
 SHOW COLUMNS
-  FROM tbl_name
-  [FROM db_name]
-  [LIKE wild]
+  FROM <replaceable>tbl_name</replaceable>
+  [FROM <replaceable>db_name</replaceable>]
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -1307,12 +1287,12 @@
 
 <programlisting>
 SELECT * FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'tbl_name'
-  [AND table_schema = 'db_name']
+  WHERE table_name = '<replaceable>tbl_name</replaceable>'
+  [AND table_schema = '<replaceable>db_name</replaceable>']
 
 SHOW INDEX
-  FROM tbl_name
-  [FROM db_name]
+  FROM <replaceable>tbl_name</replaceable>
+  [FROM <replaceable>db_name</replaceable>]
 </programlisting>
 
   </section>
@@ -1346,7 +1326,8 @@
           <row>
             <entry><literal>GRANTEE</literal></entry>
             <entry/>
-            <entry>e.g. 'user'@'host'</entry>
+            <entry><literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
+              value</entry>
           </row>
           <row>
             <entry><literal>TABLE_CATALOG</literal></entry>
@@ -1413,7 +1394,8 @@
           <row>
             <entry><literal>GRANTEE</literal></entry>
             <entry/>
-            <entry>e.g. 'user'@'host'</entry>
+            <entry><literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
+              value</entry>
           </row>
           <row>
             <entry><literal>TABLE_CATALOG</literal></entry>
@@ -1496,7 +1478,8 @@
           <row>
             <entry><literal>GRANTEE</literal></entry>
             <entry/>
-            <entry>e.g. 'user'@'host'</entry>
+            <entry><literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
+              value</entry>
           </row>
           <row>
             <entry><literal>TABLE_CATALOG</literal></entry>
@@ -1599,7 +1582,8 @@
           <row>
             <entry><literal>GRANTEE</literal></entry>
             <entry/>
-            <entry>e.g. 'user'@'host'</entry>
+            <entry><literal>'<replaceable>user_name</replaceable>'@'<replaceable>host_name</replaceable>'</literal>
+              value</entry>
           </row>
           <row>
             <entry><literal>TABLE_CATALOG</literal></entry>
@@ -1646,8 +1630,8 @@
           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.
+          <literal>COLUMN_PRIVILEGES</literal>, there is one privilege
+          per row, in uppercase.
         </para>
       </listitem>
 
@@ -1834,10 +1818,10 @@
 
 <programlisting>
 SELECT * FROM INFORMATION_SCHEMA.CHARACTER_SETS
-  [WHERE name LIKE 'wild']
+  [WHERE name LIKE '<replaceable>wild</replaceable>']
 
 SHOW CHARACTER SET
-  [LIKE 'wild']
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -2021,10 +2005,10 @@
 
 <programlisting>
 SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS
-  [WHERE collation_name LIKE 'wild']
+  [WHERE collation_name LIKE '<replaceable>wild</replaceable>']
 
 SHOW COLLATION
-  [LIKE 'wild']
+  [LIKE '<replaceable>wild</replaceable>']
 </programlisting>
 
   </section>
@@ -2402,21 +2386,27 @@
 
           <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.
+              One row with <literal>CONSTRAINT_NAME</literal> =
+              <literal>'PRIMARY'</literal>,
+              <literal>TABLE_NAME</literal> = <literal>'t1'</literal>,
+              <literal>COLUMN_NAME</literal> = <literal>'s3'</literal>,
+              <literal>ORDINAL_POSITION</literal> =
+              <literal>1</literal>,
+              <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal> =
+              <literal>NULL</literal>.
             </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.
+              One row with <literal>CONSTRAINT_NAME</literal> =
+              <literal>'CO'</literal>, <literal>TABLE_NAME</literal> =
+              <literal>'t3'</literal>, <literal>COLUMN_NAME</literal> =
+              <literal>'s2'</literal>,
+              <literal>ORDINAL_POSITION</literal> =
+              <literal>1</literal>,
+              <literal>POSITION_IN_UNIQUE_CONSTRAINT</literal> =
+              <literal>1</literal>.
             </para>
           </listitem>
 
@@ -2813,7 +2803,7 @@
 
           <listitem>
             <para>
-              If <literal>mysql.proc.language='SQL'</literal>, then
+              If <literal>mysql.proc.language='SQL'</literal>,
               <literal>EXTERNAL_LANGUAGE</literal> is
               <literal>NULL</literal>
             </para>
@@ -2821,9 +2811,9 @@
 
           <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
+              Otherwise, <literal>EXTERNAL_LANGUAGE</literal> is what is
+              in <literal>mysql.proc.language</literal>. However, we do
+              not have external languages yet, so it is always
               <literal>NULL</literal>.
             </para>
           </listitem>
@@ -2846,7 +2836,8 @@
 
     <para>
       The <literal>VIEWS</literal> table provides information about
-      views in databases.
+      views in databases. You must have the <literal>SHOW VIEW</literal>
+      privilege to access this table.
     </para>
 
     <informaltable>
@@ -2923,19 +2914,11 @@
 
       <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
+          <literal>WITH CHECK OPTION</literal>. Suppose that the
           original statement was:
         </para>
 
@@ -2948,7 +2931,7 @@
 </programlisting>
 
         <para>
-          then the view definition is:
+          Then the view definition looks like this:
         </para>
 
 <programlisting>
@@ -2994,14 +2977,10 @@
 
     <para>
       The <literal>TRIGGERS</literal> table provides information about
-      triggers.
+      triggers. You must have the <literal>SUPER</literal> privilege to
+      access 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",
@@ -3269,7 +3248,7 @@
         EVENT_OBJECT_TABLE: account
               ACTION_ORDER: 0
           ACTION_CONDITION: NULL
-          ACTION_STATEMENT:  SET @sum = @sum + NEW.amount
+          ACTION_STATEMENT: SET @sum = @sum + NEW.amount
         ACTION_ORIENTATION: ROW
              ACTION_TIMING: BEFORE
 ACTION_REFERENCE_OLD_TABLE: NULL
@@ -3277,7 +3256,8 @@
   ACTION_REFERENCE_OLD_ROW: OLD
   ACTION_REFERENCE_NEW_ROW: NEW
                    CREATED: NULL
-1 row in set (1.54 sec)
+                  SQL_MODE:
+                   DEFINER: me@localhost
 </programlisting>
 
     <para>
@@ -3654,9 +3634,8 @@
     <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>.
+      acknowledge the need for the <literal>PARAMETERS</literal> and
+      <literal>REFERENTIAL_CONSTRAINTS</literal> tables.
     </para>
 
   </section>
@@ -3732,8 +3711,8 @@
 | TABLE_CONSTRAINTS                     |
 | TABLE_PRIVILEGES                      |
 | TRIGGERS                              |
-| VIEWS                                 |
 | USER_PRIVILEGES                       |
+| VIEWS                                 |
 +---------------------------------------+
 19 rows in set (0.03 sec)
 </programlisting>
@@ -3783,7 +3762,6 @@
 | koi8r    | KOI8-R Relcom Russian       | koi8r_general_ci    |      1 |
 | latin1   | cp1252 West European        | latin1_swedish_ci   |      1 |
 | latin2   | ISO 8859-2 Central European | latin2_general_ci   |      1 |
-
 ...
 </programlisting>
 
@@ -3792,7 +3770,7 @@
       CHARACTER SET</literal>, you would refer to those column names. As
       an example, the following statement displays information about
       character sets for which the default collation contains the string
-      <literal>"japanese"</literal>:
+      <literal>'japanese'</literal>:
     </para>
 
 <programlisting>

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