List:Commits« Previous MessageNext Message »
From:paul.dubois Date:November 4 2008 3:18am
Subject:svn commit - mysqldoc@docsrva: r12272 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0
View as plain text  
Author: paul
Date: 2008-11-04 04:18:24 +0100 (Tue, 04 Nov 2008)
New Revision: 12272

Log:
 r35272@frost:  paul | 2008-11-03 21:18:54 -0500
 Format


Modified:
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/refman-4.1/dba-core.xml
   trunk/refman-5.0/apis-c.xml
   trunk/refman-5.0/dba-core.xml
   trunk/refman-5.0/faqs.xml
   trunk/refman-5.0/information-schema.xml
   trunk/refman-5.0/installing-core.xml
   trunk/refman-5.0/internationalization.xml
   trunk/refman-5.0/programs-admin-util-core.xml
   trunk/refman-5.0/views.xml
   trunk/refman-5.1-maria/sql-syntax-server-administration.xml
   trunk/refman-5.1/apis-c.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/events.xml
   trunk/refman-5.1/extending-mysql.xml
   trunk/refman-5.1/faqs.xml
   trunk/refman-5.1/information-schema.xml
   trunk/refman-5.1/installing-core.xml
   trunk/refman-5.1/internationalization.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-5.1/mysql-cluster-disk-data.xml
   trunk/refman-5.1/mysql-cluster-management.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/partitioning-guide.xml
   trunk/refman-5.1/partitioning.xml
   trunk/refman-5.1/replication-notes.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-5.1/se-innodb-core.xml
   trunk/refman-5.1/sql-syntax-data-definition.xml
   trunk/refman-5.1/sql-syntax-server-administration.xml
   trunk/refman-5.1/views.xml
   trunk/refman-6.0/apis-c.xml
   trunk/refman-6.0/collation-tmp.xml
   trunk/refman-6.0/dba-core.xml
   trunk/refman-6.0/events.xml
   trunk/refman-6.0/extending-mysql.xml
   trunk/refman-6.0/faqs.xml
   trunk/refman-6.0/information-schema.xml
   trunk/refman-6.0/internationalization.xml
   trunk/refman-6.0/introduction.xml
   trunk/refman-6.0/optimization.xml
   trunk/refman-6.0/partitioning.xml
   trunk/refman-6.0/replication-notes.xml
   trunk/refman-6.0/restrictions.xml
   trunk/refman-6.0/se-innodb-core.xml
   trunk/refman-6.0/sql-syntax-server-administration.xml
   trunk/refman-6.0/views.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35271
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34100
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35272
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34100


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 8, Lines Added: 31, Lines Deleted: 27; 5098 bytes

@@ -8187,10 +8187,10 @@
 
       <para>
         Added a <literal>ROUTINE_TYPE</literal> column to the
-        <literal role="is">INFORMATION_SCHEMA.PARAMETERS</literal> table, to make
-        it possible to distinguish like-named parameters of stored
-        routines and stored functions having the same names. See
-        <xref linkend="parameters-table"/>, for more information.
+        <literal role="is">INFORMATION_SCHEMA.PARAMETERS</literal>
+        table, to make it possible to distinguish like-named parameters
+        of stored routines and stored functions having the same names.
+        See <xref linkend="parameters-table"/>, for more information.
       </para>
 
     </message>

@@ -12790,10 +12790,11 @@
     <message>
 
       <para>
-        Selecting from <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
-        while partition management statements (for example,
-        <literal>ALTER TABLE ... ADD PARTITION</literal>) were executing
-        caused the server to crash.
+        Selecting from
+        <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> while
+        partition management statements (for example, <literal>ALTER
+        TABLE ... ADD PARTITION</literal>) were executing caused the
+        server to crash.
       </para>
 
     </message>

@@ -16246,8 +16247,9 @@
 
       <para>
         <literal role="stmt">SHOW EVENTS</literal> and selecting from
-        the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table failed if
-        the current database was <literal>INFORMATION_SCHEMA</literal>.
+        the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table
+        failed if the current database was
+        <literal>INFORMATION_SCHEMA</literal>.
       </para>
 
     </message>

@@ -16274,10 +16276,10 @@
 
       <para>
         The <literal>LAST_EXECUTED</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table now indicates
-        when the event started executing rather than when it finished
-        executing. As a result, the <literal>ENDS</literal> column is
-        never less than <literal>LAST_EXECUTED</literal>.
+        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table now
+        indicates when the event started executing rather than when it
+        finished executing. As a result, the <literal>ENDS</literal>
+        column is never less than <literal>LAST_EXECUTED</literal>.
       </para>
 
     </message>

@@ -21981,11 +21983,11 @@
       <para>
         For debug builds, reading from
         <literal role="is">INFORMATION_SCHEMA.TABLES</literal> or
-        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> could cause
-        assertion failures. This could happen under rare circumstances
-        when <literal>INFORMATION_SCHEMA</literal> fails to get
-        information about a table (for example, when a connection is
-        killed).
+        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> could
+        cause assertion failures. This could happen under rare
+        circumstances when <literal>INFORMATION_SCHEMA</literal> fails
+        to get information about a table (for example, when a connection
+        is killed).
       </para>
 
     </message>

@@ -22492,9 +22494,9 @@
 
       <para>
         View metadata returned from
-        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> was changed by the
-        fix for Bug#11986, causing the information returned in MySQL 5.1
-        to differ from that returned in 5.0.
+        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> was
+        changed by the fix for Bug#11986, causing the information
+        returned in MySQL 5.1 to differ from that returned in 5.0.
       </para>
 
     </message>

@@ -25666,8 +25668,9 @@
       <para>
         For <literal>InnoDB</literal> tables, the
         <literal>DATA_FREE</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> displayed free
-        space in kilobytes rather than bytes. Now it displays bytes.
+        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> displayed
+        free space in kilobytes rather than bytes. Now it displays
+        bytes.
       </para>
 
     </message>

@@ -31407,9 +31410,10 @@
     <message>
 
       <para>
-        For access to the <literal role="is">INFORMATION_SCHEMA.VIEWS</literal>
-        table, the server did not check the <literal>SHOW VIEW</literal>
-        and <literal role="stmt">SELECT</literal> provileges, leading to
+        For access to the
+        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table, the
+        server did not check the <literal>SHOW VIEW</literal> and
+        <literal role="stmt">SELECT</literal> provileges, leading to
         inconsistency between output from that table and the
         <literal role="stmt">SHOW CREATE VIEW</literal> statement.
       </para>


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 47, Lines Added: 138, Lines Deleted: 119; 24720 bytes

@@ -5133,8 +5133,9 @@
     <message>
 
       <para>
-        The <literal role="is">INFORMATION_SCHEMA.SCHEMATA</literal> table now has
-        a <literal>DEFAULT_COLLATION_NAME</literal> column.
+        The <literal role="is">INFORMATION_SCHEMA.SCHEMATA</literal>
+        table now has a <literal>DEFAULT_COLLATION_NAME</literal>
+        column.
       </para>
 
     </message>

@@ -6585,8 +6586,8 @@
 
       <para>
         A change in the interfaces for the
-        <literal role="is">INFORMATION_SCHEMA.FILES</literal> table has made the
-        table accessible to storage engines other than
+        <literal role="is">INFORMATION_SCHEMA.FILES</literal> table has
+        made the table accessible to storage engines other than
         <literal>NDB</literal>.
       </para>
 

@@ -18474,10 +18475,11 @@
     <message>
 
       <para>
-        Querying the <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
-        table on a non-max server caused a server crash. This also
-        happened following the creation of a table with a very large
-        number (hundreds) of partitions.
+        Querying the
+        <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table
+        on a non-max server caused a server crash. This also happened
+        following the creation of a table with a very large number
+        (hundreds) of partitions.
       </para>
 
     </message>

@@ -24857,8 +24859,9 @@
 
       <para>
         The <literal>VIEW_DEFINITION</literal> column of the
-        <literal>INFORMATION_SCHEMA</literal> <literal role="is">VIEWS</literal>
-        table now contains information about the view algorithm.
+        <literal>INFORMATION_SCHEMA</literal>
+        <literal role="is">VIEWS</literal> table now contains
+        information about the view algorithm.
       </para>
 
     </message>

@@ -25813,8 +25816,8 @@
         A bugfix in MySQL 5.0.15 caused the displayed values for the
         <literal>CHARACTER_MAXIMUM_LENGTH</literal> and
         <literal>CHARACTER_OCTET_LENGTH</literal> columns in the
-        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table to be
-        reversed.
+        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table to
+        be reversed.
       </para>
 
     </message>

@@ -30717,8 +30720,8 @@
       <para>
         The <literal>DATA_LENGTH</literal> and
         <literal>AVG_ROW_LENGTH</literal> columns of the
-        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table did not
-        report the size of variable-width column values correctly.
+        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table did
+        not report the size of variable-width column values correctly.
       </para>
 
       <para>

@@ -32302,9 +32305,9 @@
     <message>
 
       <para>
-        In the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table, the
-        <literal>EVENT_DEFINITION</literal> column now contains the SQL
-        executed by a scheduled event.
+        In the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal>
+        table, the <literal>EVENT_DEFINITION</literal> column now
+        contains the SQL executed by a scheduled event.
       </para>
 
       <para>

@@ -32317,8 +32320,8 @@
 
       <para>
         These changes were made to bring this table into line with the
-        <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table, and that
-        table's <literal>ROUTINE_BODY</literal> and
+        <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table,
+        and that table's <literal>ROUTINE_BODY</literal> and
         <literal>ROUTINE_DEFINITION</literal> columns.
       </para>
 

@@ -39282,8 +39285,8 @@
 
       <para>
         The <literal>PARTITION_COMMENT</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table had the
-        wrong default value.
+        <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table
+        had the wrong default value.
       </para>
 
     </message>

@@ -43769,8 +43772,8 @@
       <para>
         An entry in the <literal>mysql.proc</literal> table with an
         empty routine name caused access to the
-        <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table to crash
-        the server.
+        <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table
+        to crash the server.
       </para>
 
     </message>

@@ -44679,9 +44682,9 @@
 
       <para>
         The <literal>NUMERIC_SCALE</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table should be
-        returned as <literal>0</literal> for integer columns. It was
-        being returned as <literal>NULL</literal>.
+        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table
+        should be returned as <literal>0</literal> for integer columns.
+        It was being returned as <literal>NULL</literal>.
       </para>
 
     </message>

@@ -47547,7 +47550,8 @@
     <message>
 
       <para>
-        In the <literal role="is">INFORMATION_SCHEMA.KEY_COLUMN_USAGE</literal>
+        In the
+        <literal role="is">INFORMATION_SCHEMA.KEY_COLUMN_USAGE</literal>
         table, the value displayed for the
         <literal>REFERENCED_TABLE_NAME</literal> column was the table
         name as encoded for disk storage, not the actual table name.

@@ -47641,9 +47645,9 @@
 
       <para>
         For a invalid view definition, selecting from the
-        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table or using
-        <literal role="stmt">SHOW CREATE VIEW</literal> failed, making
-        it difficult to determine what part of the definition was
+        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table or
+        using <literal role="stmt">SHOW CREATE VIEW</literal> failed,
+        making it difficult to determine what part of the definition was
         invalid. Now the server returns the definition and issues a
         warning.
       </para>

@@ -51241,8 +51245,8 @@
     <message>
 
       <para>
-        <literal role="is">INFORMATION_SCHEMA.FILES</literal> records for UNDO
-        files showed incorrect values in the
+        <literal role="is">INFORMATION_SCHEMA.FILES</literal> records
+        for UNDO files showed incorrect values in the
         <literal>EXTENT_SIZE</literal>, <literal>FREE_EXTENTS</literal>,
         and <literal>TOTAL_EXTENTS</literal> columns.
       </para>

@@ -52557,8 +52561,9 @@
     <message>
 
       <para>
-        The <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table was
-        missing columns of views for which the user has access.
+        The <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal>
+        table was missing columns of views for which the user has
+        access.
       </para>
 
     </message>

@@ -57011,8 +57016,8 @@
     <message>
 
       <para>
-        In the <literal role="is">INFORMATION_SCHEMA.FILES</literal> table, the
-        <literal>INITIAL_SIZE</literal>,
+        In the <literal role="is">INFORMATION_SCHEMA.FILES</literal>
+        table, the <literal>INITIAL_SIZE</literal>,
         <literal>MAXIMUM_SIZE</literal>, and
         <literal>AUTOEXTEND_SIZE</literal> columns incorrectly were
         being stored as <literal role="type">VARCHAR</literal> rather

@@ -63545,8 +63550,9 @@
 
       <para>
         <literal role="stmt">SHOW ENGINES</literal> and queries on
-        <literal role="is">INFORMATION_SCHEMA.ENGINES</literal> did not use the
-        same values for representing the same storage engine states.
+        <literal role="is">INFORMATION_SCHEMA.ENGINES</literal> did not
+        use the same values for representing the same storage engine
+        states.
       </para>
 
     </message>

@@ -65538,8 +65544,9 @@
     <message>
 
       <para>
-        In the <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table, the
-        values for the <literal>CHARACTER_MAXIMUM_LENGTH</literal> and
+        In the <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal>
+        table, the values for the
+        <literal>CHARACTER_MAXIMUM_LENGTH</literal> and
         <literal>CHARACTER_OCTET_LENGTH</literal> columns were incorrect
         for multi-byte character sets.
       </para>

@@ -66999,7 +67006,8 @@
     <message>
 
       <para>
-        Selecting from <literal role="is">INFORMATION_SCHEMA.FILES</literal> could
+        Selecting from
+        <literal role="is">INFORMATION_SCHEMA.FILES</literal> could
         crash the server.
       </para>
 

@@ -70796,10 +70804,10 @@
 
       <para>
         The <literal>COLUMN_DEFAULT</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table should be
-        returned as <literal>NULL</literal> if a column has no default
-        value. An empty string was being returned if the column was
-        defined as <literal>NOT NULL</literal>.
+        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table
+        should be returned as <literal>NULL</literal> if a column has no
+        default value. An empty string was being returned if the column
+        was defined as <literal>NOT NULL</literal>.
       </para>
 
     </message>

@@ -76417,8 +76425,8 @@
         Because of this change, scheduled event metadata now includes
         time zone information, which can be seen in the
         <literal>TIME_ZONE</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table and the
-        <literal>Time zone</literal> column in the output of the
+        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table and
+        the <literal>Time zone</literal> column in the output of the
         <literal role="stmt">SHOW EVENTS</literal> statement. These
         columns have been added in this release, along with a
         <literal>time_zone</literal> column in the

@@ -78918,8 +78926,8 @@
         Information about scheduled events can be obtained using the
         statements <literal role="stmt">SHOW EVENTS</literal> and
         <literal role="stmt">SHOW CREATE EVENT</literal>, or by querying
-        the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table. All of
-        these are available beginning in MySQL 5.1.6.
+        the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal>
+        table. All of these are available beginning in MySQL 5.1.6.
       </para>
 
       <para>

@@ -80424,8 +80432,8 @@
         In addition, both the <literal role="stmt">SHOW EVENTS</literal>
         statement's <literal>Starts</literal> column and the
         <literal>STARTS</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table are now empty
-        rather than <literal>NULL</literal> when
+        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table are
+        now empty rather than <literal>NULL</literal> when
         <literal>STARTS</literal> was not used in the
         <literal role="stmt">CREATE EVENT</literal> statement.
       </para>

@@ -80860,9 +80868,10 @@
           If any partitioned tables that were created prior to MySQL
           5.1.6 are present following an upgrade to MySQL 5.1.6 or
           later, it is also not possible to read from the
-          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table, nor
-          will you be able to drop those tables or the database or
-          databases in which they are located. In this event, you must:
+          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+          table, nor will you be able to drop those tables or the
+          database or databases in which they are located. In this
+          event, you must:
           <orderedlist>
 
             <listitem>

@@ -84329,8 +84338,9 @@
       <para>
         The value of the <literal>CHARACTER_MAXIMUM_LENGTH</literal> and
         <literal>CHARACTER_OCTET_LENGTH</literal> columns of the
-        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table must be
-        <literal>NULL</literal> for numeric columns, but were not.
+        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table
+        must be <literal>NULL</literal> for numeric columns, but were
+        not.
       </para>
 
     </message>

@@ -86680,9 +86690,9 @@
     <message>
 
       <para>
-        Added the <literal role="is">REFERENTIAL_CONSTRAINTS</literal> table to
-        <literal>INFORMATION_SCHEMA</literal>. It provides information
-        about foreign keys.
+        Added the <literal role="is">REFERENTIAL_CONSTRAINTS</literal>
+        table to <literal>INFORMATION_SCHEMA</literal>. It provides
+        information about foreign keys.
       </para>
 
     </message>

@@ -89356,8 +89366,9 @@
 
       <para>
         The <literal>CREATE_OPTIONS</literal> column of
-        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> showed incorrect
-        options for tables in <literal>INFORMATION_SCHEMA</literal>.
+        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> showed
+        incorrect options for tables in
+        <literal>INFORMATION_SCHEMA</literal>.
       </para>
 
     </message>

@@ -90056,12 +90067,12 @@
     <message>
 
       <para>
-        In the <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table the
-        <literal>ROUTINE_DEFINITION</literal> column now is defined as
-        <literal>NULL</literal> rather than <literal>NOT NULL</literal>.
-        Also, <literal>NULL</literal> rather than the empty string is
-        returned as the column value if the user does not have
-        sufficient privileges to see the routine definition.
+        In the <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal>
+        table the <literal>ROUTINE_DEFINITION</literal> column now is
+        defined as <literal>NULL</literal> rather than <literal>NOT
+        NULL</literal>. Also, <literal>NULL</literal> rather than the
+        empty string is returned as the column value if the user does
+        not have sufficient privileges to see the routine definition.
       </para>
 
     </message>

@@ -96202,11 +96213,12 @@
         <literal>INFORMATION_SCHEMA</literal> contains new tables,
         <literal role="is" condition="status">GLOBAL_STATUS</literal>,
         <literal role="is" condition="status">SESSION_STATUS</literal>,
-        <literal role="is" condition="variables">GLOBAL_VARIABLES</literal>, and
-        <literal role="is" condition="variables">SESSION_VARIABLES</literal>, that correspond to the
-        output from the <literal>SHOW {GLOBAL|SESSION} STATUS</literal>
-        and <literal>SHOW {GLOBAL|SESSION} VARIABLES</literal>
-        statements.
+        <literal role="is" condition="variables">GLOBAL_VARIABLES</literal>,
+        and
+        <literal role="is" condition="variables">SESSION_VARIABLES</literal>,
+        that correspond to the output from the <literal>SHOW
+        {GLOBAL|SESSION} STATUS</literal> and <literal>SHOW
+        {GLOBAL|SESSION} VARIABLES</literal> statements.
       </para>
 
     </message>

@@ -97532,10 +97544,11 @@
 
       <para>
         For the <literal>INFORMATION_SCHEMA</literal>
-        <literal role="is" condition="status">SESSION_STATUS</literal> and
-        <literal role="is" condition="status">GLOBAL_STATUS</literal> tables, some status values were
-        incorrectly converted to the data type of the
-        <literal>VARIABLE_VALUE</literal> column.
+        <literal role="is" condition="status">SESSION_STATUS</literal>
+        and
+        <literal role="is" condition="status">GLOBAL_STATUS</literal>
+        tables, some status values were incorrectly converted to the
+        data type of the <literal>VARIABLE_VALUE</literal> column.
       </para>
 
     </message>

@@ -98647,7 +98660,8 @@
         <literal role="is">VIEWS</literal> table now has these columns:
         <literal>CHARACTER_SET_CLIENT</literal>,
         <literal>COLLATION_CONNECTION</literal>. The
-        <literal role="is">ROUTINES</literal>, <literal role="is">TRIGGERS</literal>, and
+        <literal role="is">ROUTINES</literal>,
+        <literal role="is">TRIGGERS</literal>, and
         <literal>EVENT</literal> tables now have these columns:
         <literal>CHARACTER_SET_CLIENT</literal>,
         <literal>COLLATION_CONNECTION</literal>,

@@ -99896,8 +99910,8 @@
 
       <para>
         The <literal>IS_UPDATABLE</literal> column in the
-        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table was not always
-        set correctly.
+        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table was
+        not always set correctly.
       </para>
 
     </message>

@@ -104276,8 +104290,8 @@
         <literal role="stmt" condition="show-profiles">SHOW
         PROFILE</literal> statements to display statement profile data,
         and the accompanying
-        <literal role="is">INFORMATION_SCHEMA.PROFILING</literal> table. Profiling
-        is controlled via the <literal>profiling</literal> and
+        <literal role="is">INFORMATION_SCHEMA.PROFILING</literal> table.
+        Profiling is controlled via the <literal>profiling</literal> and
         <literal>profiling_history_size</literal> session variables. see
         <xref linkend="show-profiles"/>, and
         <xref linkend="profiling-table"/>. (Community contribution by

@@ -104644,8 +104658,9 @@
     <message>
 
       <para>
-        Results from <literal role="is">INFORMATION_SCHEMA.SCHEMATA</literal>
-        could contain uppercase information when
+        Results from
+        <literal role="is">INFORMATION_SCHEMA.SCHEMATA</literal> could
+        contain uppercase information when
         <literal>lower_case_table_names</literal> was not 0.
       </para>
 

@@ -106187,8 +106202,8 @@
       <para>
         The displayed value for the
         <literal>CHARACTER_MAXIMUM_LENGTH</literal> column in the
-        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table was not
-        adjusted for multi-byte character sets.
+        <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table
+        was not adjusted for multi-byte character sets.
       </para>
 
     </message>

@@ -120841,9 +120856,9 @@
 
       <para>
         The <literal>STATE</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.PROCESSLIST</literal> table was
-        increased from 30 to 64 characters to accommodate longer state
-        values.
+        <literal role="is">INFORMATION_SCHEMA.PROCESSLIST</literal>
+        table was increased from 30 to 64 characters to accommodate
+        longer state values.
       </para>
 
     </message>

@@ -126847,8 +126862,8 @@
 
       <para>
         The <literal>IS_UPDATABLE</literal> column in the
-        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table was not always
-        set correctly.
+        <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table was
+        not always set correctly.
       </para>
 
     </message>

@@ -133037,7 +133052,8 @@
         For a table having <literal>LINEAR HASH</literal> subpartitions,
         the <literal>LINEAR</literal> keyword did not appear in the
         <literal>SUBPARTITION_METHOD</literal> column of the
-        <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table.
+        <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+        table.
       </para>
 
     </message>

@@ -133557,8 +133573,8 @@
         <literal>Create_options</literal> column, the output now shows
         <literal>partitioned</literal> for a partitioned table. This
         change also affects the values shown in the corresponding
-        columns of the <literal role="is">INFORMATION_SCHEMA.TABLES</literal>
-        table.
+        columns of the
+        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table.
       </para>
 
     </message>

@@ -135040,11 +135056,12 @@
         <listitem>
           <para>
             In <literal>INFORMATION_SCHEMA</literal>, the
-            <literal role="is">VIEWS</literal> table now has these columns:
-            <literal>CHARACTER_SET_CLIENT</literal>,
+            <literal role="is">VIEWS</literal> table now has these
+            columns: <literal>CHARACTER_SET_CLIENT</literal>,
             <literal>COLLATION_CONNECTION</literal>. The
-            <literal role="is">ROUTINES</literal>, <literal role="is">TRIGGERS</literal>,
-            and <literal>EVENT</literal> tables now have these columns:
+            <literal role="is">ROUTINES</literal>,
+            <literal role="is">TRIGGERS</literal>, and
+            <literal>EVENT</literal> tables now have these columns:
             <literal>CHARACTER_SET_CLIENT</literal>,
             <literal>COLLATION_CONNECTION</literal>,
             <literal>DATABASE_COLLATION</literal>.

@@ -136211,9 +136228,9 @@
     <message>
 
       <para>
-        The <literal role="is">INFORMATION_SCHEMA.STATISTICS</literal> table now
-        has an <literal>INDEX_COMMENT</literal> column to indicate any
-        comment string provided for the column. The
+        The <literal role="is">INFORMATION_SCHEMA.STATISTICS</literal>
+        table now has an <literal>INDEX_COMMENT</literal> column to
+        indicate any comment string provided for the column. The
         <literal role="stmt">SHOW INDEX</literal> statement now displays
         an <literal>Index_comment</literal> column that provides the
         same information.

@@ -136237,12 +136254,13 @@
     <message>
 
       <para>
-        The <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table now has
-        <literal>STORAGE</literal> and <literal>FORMAT</literal>
-        columns. For <literal>NDB</literal> tables,
-        <literal>STORAGE</literal> indicates whether a column is stored
-        on disk or memory, and <literal>FORMAT</literal> indicates the
-        column storage format (<literal role="type">FIXED</literal>,
+        The <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal>
+        table now has <literal>STORAGE</literal> and
+        <literal>FORMAT</literal> columns. For <literal>NDB</literal>
+        tables, <literal>STORAGE</literal> indicates whether a column is
+        stored on disk or memory, and <literal>FORMAT</literal>
+        indicates the column storage format
+        (<literal role="type">FIXED</literal>,
         <literal>DYNAMIC</literal>, or <literal>DEFAULT</literal>).
       </para>
 

@@ -136266,9 +136284,10 @@
 
       <para>
         Several columns were added to the
-        <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table to provide
-        information about the <literal>RETURNS</literal> clause data
-        type for stored functions: <literal>DATA_TYPE</literal>,
+        <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table
+        to provide information about the <literal>RETURNS</literal>
+        clause data type for stored functions:
+        <literal>DATA_TYPE</literal>,
         <literal>CHARACTER_MAXIMUM_LENGTH</literal>,
         <literal>CHARACTER_OCTET_LENGTH</literal>,
         <literal>NUMERIC_PRECISION</literal>,

@@ -136279,9 +136298,9 @@
 
       <para>
         This change produces an incompatibility for applications that
-        depend on column order in the <literal role="is">ROUTINES</literal> table
-        because the new columns appear between the
-        <literal>ROUTINE_TYPE</literal> and
+        depend on column order in the
+        <literal role="is">ROUTINES</literal> table because the new
+        columns appear between the <literal>ROUTINE_TYPE</literal> and
         <literal>DTD_IDENTIFIER</literal> columns. Such applications may
         need to be adjusted to account for the new columns.
       </para>

@@ -136306,9 +136325,9 @@
       <para>
         Added the <literal role="is">PARAMETERS</literal> table to
         <literal>INFORMATION_SCHEMA</literal>. The
-        <literal role="is">PARAMETERS</literal> table provides information about
-        stored function and procedure parameters, and about return
-        values for stored functions.
+        <literal role="is">PARAMETERS</literal> table provides
+        information about stored function and procedure parameters, and
+        about return values for stored functions.
       </para>
 
     </message>

@@ -137946,8 +137965,8 @@
     <message>
 
       <para>
-        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> was returning
-        incorrect information.
+        <literal role="is">INFORMATION_SCHEMA.TABLES</literal> was
+        returning incorrect information.
       </para>
 
     </message>

@@ -138186,8 +138205,8 @@
     <message>
 
       <para>
-        <literal role="is">INFORMATION_SCHEMA.SCHEMATA</literal> was returning
-        incorrect information.
+        <literal role="is">INFORMATION_SCHEMA.SCHEMATA</literal> was
+        returning incorrect information.
       </para>
 
     </message>


Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-4.1/dba-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1227 bytes

@@ -6796,14 +6796,15 @@
 
           <para>
             The purpose of these variables is to support replication of
-            the <literal role="func">RAND()</literal> function. For statements that
-            invoke <literal role="func">RAND()</literal>, the master passes two
+            the <literal role="func">RAND()</literal> function. For
+            statements that invoke
+            <literal role="func">RAND()</literal>, the master passes two
             values to the slave, where they are used to seed the random
             number generator. The slave uses these values to set the
             session variables <literal>rand_seed1</literal> and
             <literal>rand_seed2</literal> so that
-            <literal role="func">RAND()</literal> on the slave generates the same
-            value as on the master.
+            <literal role="func">RAND()</literal> on the slave generates
+            the same value as on the master.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.0/apis-c.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 891 bytes

@@ -685,9 +685,10 @@
           <literal role="stmt">SHOW COLLATION</literal> statement or the
           <literal>ID</literal> column of the
           <literal>INFORMATION_SCHEMA</literal>
-          <literal role="is">COLLATIONS</literal> table. You can use those
-          information sources to see which character set and collation
-          specific <literal>charsetnr</literal> values indicate:
+          <literal role="is">COLLATIONS</literal> table. You can use
+          those information sources to see which character set and
+          collation specific <literal>charsetnr</literal> values
+          indicate:
         </para>
 
 <programlisting>


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.0/dba-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1528 bytes

@@ -8089,14 +8089,15 @@
 
           <para>
             The purpose of these variables is to support replication of
-            the <literal role="func">RAND()</literal> function. For statements that
-            invoke <literal role="func">RAND()</literal>, the master passes two
+            the <literal role="func">RAND()</literal> function. For
+            statements that invoke
+            <literal role="func">RAND()</literal>, the master passes two
             values to the slave, where they are used to seed the random
             number generator. The slave uses these values to set the
             session variables <literal>rand_seed1</literal> and
             <literal>rand_seed2</literal> so that
-            <literal role="func">RAND()</literal> on the slave generates the same
-            value as on the master.
+            <literal role="func">RAND()</literal> on the slave generates
+            the same value as on the master.
           </para>
         </listitem>
 

@@ -20793,8 +20794,7 @@
         <listitem>
           <para>
             Views defined with the <literal>SQL SECURITY
-            DEFINER</literal> characteristic (as of MySQL
-            5.0.24).
+            DEFINER</literal> characteristic (as of MySQL 5.0.24).
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.0/faqs.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 6, Lines Added: 15, Lines Deleted: 14; 3168 bytes

@@ -742,7 +742,8 @@
           <para>
             Yes. For a database named <replaceable>dbname</replaceable>,
             use this query on the
-            <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table:
+            <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal>
+            table:
           </para>
 
 <programlisting>

@@ -793,10 +794,10 @@
           </para>
 
           <para>
-            You can also query the <literal role="is">ROUTINES</literal> table in
-            the <literal>INFORMATION_SCHEMA</literal> database &mdash;
-            see <xref linkend="routines-table"/>, for information about
-            this table.
+            You can also query the <literal role="is">ROUTINES</literal>
+            table in the <literal>INFORMATION_SCHEMA</literal> database
+            &mdash; see <xref linkend="routines-table"/>, for
+            information about this table.
           </para>
 
         </answer>

@@ -1475,8 +1476,8 @@
 
           <para>
             Information about triggers can be obtained by querying the
-            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal> table. See
-            <xref linkend="triggers-table"/>.
+            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal>
+            table. See <xref linkend="triggers-table"/>.
           </para>
 
         </answer>

@@ -1498,8 +1499,8 @@
           <para>
             Yes. You can obtain a listing of all triggers defined on
             database <literal>dbname</literal> using a query on the
-            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal> table such as
-            the one shown here:
+            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal>
+            table such as the one shown here:
           </para>
 
 <programlisting>

@@ -4981,9 +4982,9 @@
             <xref linkend="news-5-0-3"/>). However, since the name of
             the applicable language appears in the
             <literal>DESCRIPTION</literal> column for every entry in the
-            <literal role="is">INFORMATION_SCHEMA.CHARACTER_SETS</literal> table,
-            you can obtain a current list of all the non-Unicode CJK
-            character sets using this query:
+            <literal role="is">INFORMATION_SCHEMA.CHARACTER_SETS</literal>
+            table, you can obtain a current list of all the non-Unicode
+            CJK character sets using this query:
 
 <programlisting>
 mysql&gt; <userinput>SELECT CHARACTER_SET_NAME, DESCRIPTION</userinput>

@@ -6599,8 +6600,8 @@
 
             Since the character set appears to be correct, let's see
             what information the
-            <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table can
-            provide about this column:
+            <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal>
+            table can provide about this column:
 
 <programlisting>
 mysql&gt; <userinput>SELECT COLUMN_NAME, CHARACTER_SET_NAME, COLLATION_NAME</userinput>


Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.0/information-schema.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 21, Lines Added: 60, Lines Deleted: 53; 9821 bytes

@@ -107,8 +107,9 @@
     only the rows in the tables that correspond to objects for which the
     user has the proper access privileges. In some cases (for example,
     the <literal>ROUTINE_DEFINITION</literal> column in the
-    <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table), users who
-    have insufficient privileges will see <literal>NULL</literal>.
+    <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table),
+    users who have insufficient privileges will see
+    <literal>NULL</literal>.
   </para>
 
   <para>

@@ -192,7 +193,8 @@
     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>
-    column in the <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table.
+    column in the <literal role="is">INFORMATION_SCHEMA.TABLES</literal>
+    table.
   </para>
 
   <para>

@@ -251,8 +253,8 @@
     SQL Server, or Oracle, we changed the names of some columns marked
     <quote>MySQL extension</quote>. (For example, we changed
     <literal>COLLATION</literal> to <literal>TABLE_COLLATION</literal>
-    in the <literal role="is">TABLES</literal> table.) See the list of reserved
-    words near the end of this article:
+    in the <literal role="is">TABLES</literal> table.) See the list of
+    reserved words near the end of this article:
     <ulink url="http://web.archive.org/web/20030201202307/www.dbazine.com/gulutzan5.html"/>.
   </para>
 

@@ -307,8 +309,9 @@
     </indexterm>
 
     <para>
-      A schema is a database, so the <literal role="is">SCHEMATA</literal> table
-      provides information about databases.
+      A schema is a database, so the
+      <literal role="is">SCHEMATA</literal> table provides information
+      about databases.
     </para>
 
     <informaltable>

@@ -425,8 +428,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLES</literal> table provides information about
-      tables in databases.
+      The <literal role="is">TABLES</literal> table provides information
+      about tables in databases.
     </para>
 
     <informaltable>

@@ -692,8 +695,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">COLUMNS</literal> table provides information about
-      columns in tables.
+      The <literal role="is">COLUMNS</literal> table provides
+      information about columns in tables.
     </para>
 
     <informaltable>

@@ -1178,8 +1181,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">STATISTICS</literal> table provides information about
-      table indexes.
+      The <literal role="is">STATISTICS</literal> table provides
+      information about table indexes.
     </para>
 
     <informaltable>

@@ -1357,9 +1360,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">USER_PRIVILEGES</literal> table provides information
-      about global privileges. This information comes from the
-      <literal>mysql.user</literal> grant table.
+      The <literal role="is">USER_PRIVILEGES</literal> table provides
+      information about global privileges. This information comes from
+      the <literal>mysql.user</literal> grant table.
     </para>
 
     <informaltable>

@@ -1500,9 +1503,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLE_PRIVILEGES</literal> table provides information
-      about table privileges. This information comes from the
-      <literal>mysql.tables_priv</literal> grant table.
+      The <literal role="is">TABLE_PRIVILEGES</literal> table provides
+      information about table privileges. This information comes from
+      the <literal>mysql.tables_priv</literal> grant table.
     </para>
 
     <informaltable>

@@ -1695,8 +1698,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 role="is">COLUMN_PRIVILEGES</literal>, there is one privilege
-          per row, in uppercase.
+          <literal role="is">COLUMN_PRIVILEGES</literal>, there is one
+          privilege per row, in uppercase.
         </para>
       </listitem>
 

@@ -1745,8 +1748,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">CHARACTER_SETS</literal> table provides information
-      about available character sets.
+      The <literal role="is">CHARACTER_SETS</literal> table provides
+      information about available character sets.
     </para>
 
     <informaltable>

@@ -1886,8 +1889,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">COLLATIONS</literal> table provides information about
-      collations for each character set.
+      The <literal role="is">COLLATIONS</literal> table provides
+      information about collations for each character set.
     </para>
 
     <informaltable>

@@ -2027,10 +2030,12 @@
     </indexterm>
 
     <para>
-      The <literal role="is">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 role="stmt">SHOW COLLATION</literal>.
+      The
+      <literal role="is">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 role="stmt">SHOW
+      COLLATION</literal>.
     </para>
 
     <informaltable>

@@ -2115,8 +2120,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLE_CONSTRAINTS</literal> table describes which
-      tables have constraints.
+      The <literal role="is">TABLE_CONSTRAINTS</literal> table describes
+      which tables have constraints.
     </para>
 
     <informaltable>

@@ -2249,8 +2254,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">KEY_COLUMN_USAGE</literal> table describes which key
-      columns have constraints.
+      The <literal role="is">KEY_COLUMN_USAGE</literal> table describes
+      which key columns have constraints.
     </para>
 
     <informaltable>

@@ -2386,8 +2391,9 @@
 </programlisting>
 
         <para>
-          For those two tables, the <literal role="is">KEY_COLUMN_USAGE</literal>
-          table has two rows:
+          For those two tables, the
+          <literal role="is">KEY_COLUMN_USAGE</literal> table has two
+          rows:
         </para>
 
         <itemizedlist>

@@ -2444,17 +2450,18 @@
     </indexterm>
 
     <para>
-      The <literal role="is">ROUTINES</literal> table provides information about
-      stored routines (both procedures and functions). The
-      <literal role="is">ROUTINES</literal> table does not include user-defined
-      functions (UDFs) at this time.
+      The <literal role="is">ROUTINES</literal> table provides
+      information about stored routines (both procedures and functions).
+      The <literal role="is">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 role="is">INFORMATION_SCHEMA.ROUTINES</literal>
-      table column, if any.
+      corresponds to the
+      <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table
+      column, if any.
     </para>
 
     <informaltable>

@@ -2853,9 +2860,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">VIEWS</literal> table provides information about
-      views in databases. You must have the <literal>SHOW VIEW</literal>
-      privilege to access this table.
+      The <literal role="is">VIEWS</literal> table provides information
+      about views in databases. You must have the <literal>SHOW
+      VIEW</literal> privilege to access this table.
     </para>
 
     <informaltable>

@@ -2976,10 +2983,10 @@
           are legal for the view. Otherwise, the flag is set to
           <literal>NO</literal> (false). The
           <literal>IS_UPDATABLE</literal> column in the
-          <literal role="is">VIEWS</literal> table displays the status of this
-          flag. It means that the server always knows whether a view is
-          updatable. If the view is not updatable, statements such
-          <literal role="stmt">UPDATE</literal>,
+          <literal role="is">VIEWS</literal> table displays the status
+          of this flag. It means that the server always knows whether a
+          view is updatable. If the view is not updatable, statements
+          such <literal role="stmt">UPDATE</literal>,
           <literal role="stmt">DELETE</literal>, and
           <literal role="stmt">INSERT</literal> are illegal and will be
           rejected. (Note that even if a view is updatable, it might not

@@ -3012,9 +3019,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TRIGGERS</literal> table provides information about
-      triggers. You must have the <literal>SUPER</literal> privilege to
-      access this table.
+      The <literal role="is">TRIGGERS</literal> table provides
+      information about triggers. You must have the
+      <literal>SUPER</literal> privilege to access this table.
     </para>
 
     <remark role="note">

@@ -3158,8 +3165,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">TRIGGERS</literal> table was added in MySQL
-          5.0.10.
+          The <literal role="is">TRIGGERS</literal> table was added in
+          MySQL 5.0.10.
         </para>
       </listitem>
 


Modified: trunk/refman-5.0/installing-core.xml
===================================================================
--- trunk/refman-5.0/installing-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.0/installing-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 755 bytes

@@ -12039,8 +12039,8 @@
               <para>
                 Upgrade to MySQL 5.0.10 or later to be able to access
                 trigger information in the
-                <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal> table.
-                (It should work even for pre-5.0.10 triggers.)
+                <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal>
+                table. (It should work even for pre-5.0.10 triggers.)
               </para>
             </listitem>
 


Modified: trunk/refman-5.0/internationalization.xml
===================================================================
--- trunk/refman-5.0/internationalization.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.0/internationalization.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 5; 1367 bytes

@@ -3126,10 +3126,10 @@
           contain information similar to that displayed by the
           <literal>SHOW</literal> statements. For example, the
           <literal role="is">CHARACTER_SETS</literal> and
-          <literal role="is">COLLATIONS</literal> tables contain the information
-          displayed by <literal role="stmt">SHOW CHARACTER SET</literal>
-          and <literal role="stmt">SHOW COLLATION</literal>. See
-          <xref linkend="information-schema"/>.
+          <literal role="is">COLLATIONS</literal> tables contain the
+          information displayed by <literal role="stmt">SHOW CHARACTER
+          SET</literal> and <literal role="stmt">SHOW
+          COLLATION</literal>. See <xref linkend="information-schema"/>.
         </para>
 
         <para>

@@ -6784,7 +6784,8 @@
         <listitem>
           <para>
             The <literal>ID</literal> column of the
-            <literal role="is">INFORMATION_SCHEMA.COLLATIONS</literal> table
+            <literal role="is">INFORMATION_SCHEMA.COLLATIONS</literal>
+            table
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.0/programs-admin-util-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.0/programs-admin-util-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 3; 968 bytes

@@ -7909,9 +7909,11 @@
       <para>
         In MySQL 5.0 and up, the <literal>INFORMATION_SCHEMA</literal>
         database contains the same kind of information in the
-        <literal role="is">SCHEMATA</literal>, <literal role="is">TABLES</literal>,
-        <literal role="is">COLUMNS</literal>, and <literal role="is">STATISTICS</literal>
-        tables. See <xref linkend="information-schema"/>.
+        <literal role="is">SCHEMATA</literal>,
+        <literal role="is">TABLES</literal>,
+        <literal role="is">COLUMNS</literal>, and
+        <literal role="is">STATISTICS</literal> tables. See
+        <xref linkend="information-schema"/>.
       </para>
 
       <para>


Modified: trunk/refman-5.0/views.xml
===================================================================
--- trunk/refman-5.0/views.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.0/views.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 826 bytes

@@ -638,7 +638,8 @@
       <literal role="stmt">DELETE</literal> (and similar operations) are
       legal for the view. Otherwise, the flag is set to
       <literal>NO</literal> (false). The <literal>IS_UPDATABLE</literal>
-      column in the <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table
+      column in the
+      <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table
       displays the status of this flag. It means that the server always
       knows whether a view is updatable. If the view is not updatable,
       statements such <literal role="stmt">UPDATE</literal>,


Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/apis-c.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 891 bytes

@@ -679,9 +679,10 @@
           <literal role="stmt">SHOW COLLATION</literal> statement or the
           <literal>ID</literal> column of the
           <literal>INFORMATION_SCHEMA</literal>
-          <literal role="is">COLLATIONS</literal> table. You can use those
-          information sources to see which character set and collation
-          specific <literal>charsetnr</literal> values indicate:
+          <literal role="is">COLLATIONS</literal> table. You can use
+          those information sources to see which character set and
+          collation specific <literal>charsetnr</literal> values
+          indicate:
         </para>
 
 <programlisting>


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/dba-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1227 bytes

@@ -8627,14 +8627,15 @@
 
           <para>
             The purpose of these variables is to support replication of
-            the <literal role="func">RAND()</literal> function. For statements that
-            invoke <literal role="func">RAND()</literal>, the master passes two
+            the <literal role="func">RAND()</literal> function. For
+            statements that invoke
+            <literal role="func">RAND()</literal>, the master passes two
             values to the slave, where they are used to seed the random
             number generator. The slave uses these values to set the
             session variables <literal>rand_seed1</literal> and
             <literal>rand_seed2</literal> so that
-            <literal role="func">RAND()</literal> on the slave generates the same
-            value as on the master.
+            <literal role="func">RAND()</literal> on the slave generates
+            the same value as on the master.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/events.xml
===================================================================
--- trunk/refman-5.1/events.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/events.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 11; 2166 bytes

@@ -523,12 +523,12 @@
     </para>
 
     <para>
-      MySQL 5.1.6 and later provides an <literal role="is">EVENTS</literal> table
-      in the <literal>INFORMATION_SCHEMA</literal> database. This table
-      can be queried to obtain information about scheduled events which
-      have been defined on the server. See
-      <xref linkend="events-metadata"/>, and
-      <xref linkend="events-table"/>, for more information.
+      MySQL 5.1.6 and later provides an
+      <literal role="is">EVENTS</literal> table in the
+      <literal>INFORMATION_SCHEMA</literal> database. This table can be
+      queried to obtain information about scheduled events which have
+      been defined on the server. See <xref linkend="events-metadata"/>,
+      and <xref linkend="events-table"/>, for more information.
     </para>
 
     <para>

@@ -844,9 +844,10 @@
     </indexterm>
 
     <para>
-      Inspection of the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal>
-      table shows that <literal>e_store_ts</literal> exists and is
-      enabled, but its <literal>LAST_EXECUTED</literal> column is
+      Inspection of the
+      <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table shows
+      that <literal>e_store_ts</literal> exists and is enabled, but its
+      <literal>LAST_EXECUTED</literal> column is
       <literal>NULL</literal>:
     </para>
 

@@ -958,8 +959,9 @@
     <para>
       You can verify that this is true by examining the
       <literal>mysql.event</literal> table (discussed later in this
-      section) or the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table
-      (see <xref linkend="events-table"/>) before and after issuing a
+      section) or the
+      <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table (see
+      <xref linkend="events-table"/>) before and after issuing a
       <literal role="stmt">DROP USER</literal> or
       <literal role="stmt">RENAME USER</literal> statement.
     </para>


Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/extending-mysql.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1026 bytes

@@ -865,9 +865,9 @@
             <para>
               The plugin version number. When the plugin is installed,
               this value can be retrieved from the
-              <literal role="is">INFORMATION_SCHEMA.PLUGINS</literal> table. The
-              value includes major and minor numbers. If you write the
-              value as a hex constant, the format is
+              <literal role="is">INFORMATION_SCHEMA.PLUGINS</literal>
+              table. The value includes major and minor numbers. If you
+              write the value as a hex constant, the format is
               <literal>0x<replaceable>MMNN</replaceable></literal>,
               where <replaceable>MM</replaceable> and
               <literal>NN</literal> are the major and minor numbers,


Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/faqs.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 6, Lines Added: 14, Lines Deleted: 12; 3000 bytes

@@ -758,7 +758,8 @@
           <para>
             Yes. For a database named <replaceable>dbname</replaceable>,
             use this query on the
-            <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table:
+            <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal>
+            table:
           </para>
 
 <programlisting>

@@ -809,10 +810,10 @@
           </para>
 
           <para>
-            You can also query the <literal role="is">ROUTINES</literal> table in
-            the <literal>INFORMATION_SCHEMA</literal> database &mdash;
-            see <xref linkend="routines-table"/>, for information about
-            this table.
+            You can also query the <literal role="is">ROUTINES</literal>
+            table in the <literal>INFORMATION_SCHEMA</literal> database
+            &mdash; see <xref linkend="routines-table"/>, for
+            information about this table.
           </para>
 
         </answer>

@@ -1500,8 +1501,8 @@
 
           <para>
             Information about triggers can be obtained by querying the
-            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal> table. See
-            <xref linkend="triggers-table"/>.
+            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal>
+            table. See <xref linkend="triggers-table"/>.
           </para>
 
         </answer>

@@ -1523,8 +1524,8 @@
           <para>
             Yes. You can obtain a listing of all triggers defined on
             database <literal>dbname</literal> using a query on the
-            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal> table such as
-            the one shown here:
+            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal>
+            table such as the one shown here:
           </para>
 
 <programlisting>

@@ -5049,7 +5050,8 @@
             character set was not supported prior to MySQL 5.0.3.
             However, since the name of the applicable language appears
             in the <literal>DESCRIPTION</literal> column for every entry
-            in the <literal role="is">INFORMATION_SCHEMA.CHARACTER_SETS</literal>
+            in the
+            <literal role="is">INFORMATION_SCHEMA.CHARACTER_SETS</literal>
             table, you can obtain a current list of all the non-Unicode
             CJK character sets using this query:
 

@@ -6667,8 +6669,8 @@
 
             Since the character set appears to be correct, let's see
             what information the
-            <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table can
-            provide about this column:
+            <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal>
+            table can provide about this column:
 
 <programlisting>
 mysql&gt; <userinput>SELECT COLUMN_NAME, CHARACTER_SET_NAME, COLLATION_NAME</userinput>


Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/information-schema.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 47, Lines Added: 164, Lines Deleted: 140; 25199 bytes

@@ -107,8 +107,9 @@
     only the rows in the tables that correspond to objects for which the
     user has the proper access privileges. In some cases (for example,
     the <literal>ROUTINE_DEFINITION</literal> column in the
-    <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table), users who
-    have insufficient privileges will see <literal>NULL</literal>.
+    <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table),
+    users who have insufficient privileges will see
+    <literal>NULL</literal>.
   </para>
 
   <para>

@@ -192,7 +193,8 @@
     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>
-    column in the <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table.
+    column in the <literal role="is">INFORMATION_SCHEMA.TABLES</literal>
+    table.
   </para>
 
   <para>

@@ -251,8 +253,8 @@
     SQL Server, or Oracle, we changed the names of some columns marked
     <quote>MySQL extension</quote>. (For example, we changed
     <literal>COLLATION</literal> to <literal>TABLE_COLLATION</literal>
-    in the <literal role="is">TABLES</literal> table.) See the list of reserved
-    words near the end of this article:
+    in the <literal role="is">TABLES</literal> table.) See the list of
+    reserved words near the end of this article:
     <ulink url="http://web.archive.org/web/20030201202307/www.dbazine.com/gulutzan5.html"/>.
   </para>
 

@@ -306,8 +308,9 @@
     </indexterm>
 
     <para>
-      A schema is a database, so the <literal role="is">SCHEMATA</literal> table
-      provides information about databases.
+      A schema is a database, so the
+      <literal role="is">SCHEMATA</literal> table provides information
+      about databases.
     </para>
 
     <informaltable>

@@ -409,8 +412,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLES</literal> table provides information about
-      tables in databases.
+      The <literal role="is">TABLES</literal> table provides information
+      about tables in databases.
     </para>
 
     <informaltable>

@@ -718,8 +721,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">COLUMNS</literal> table provides information about
-      columns in tables.
+      The <literal role="is">COLUMNS</literal> table provides
+      information about columns in tables.
     </para>
 
     <informaltable>

@@ -1204,8 +1207,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">STATISTICS</literal> table provides information about
-      table indexes.
+      The <literal role="is">STATISTICS</literal> table provides
+      information about table indexes.
     </para>
 
     <informaltable>

@@ -1383,9 +1386,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">USER_PRIVILEGES</literal> table provides information
-      about global privileges. This information comes from the
-      <literal>mysql.user</literal> grant table.
+      The <literal role="is">USER_PRIVILEGES</literal> table provides
+      information about global privileges. This information comes from
+      the <literal>mysql.user</literal> grant table.
     </para>
 
     <informaltable>

@@ -1526,9 +1529,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLE_PRIVILEGES</literal> table provides information
-      about table privileges. This information comes from the
-      <literal>mysql.tables_priv</literal> grant table.
+      The <literal role="is">TABLE_PRIVILEGES</literal> table provides
+      information about table privileges. This information comes from
+      the <literal>mysql.tables_priv</literal> grant table.
     </para>
 
     <informaltable>

@@ -1721,8 +1724,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 role="is">COLUMN_PRIVILEGES</literal>, there is one privilege
-          per row, in uppercase.
+          <literal role="is">COLUMN_PRIVILEGES</literal>, there is one
+          privilege per row, in uppercase.
         </para>
       </listitem>
 

@@ -1771,8 +1774,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">CHARACTER_SETS</literal> table provides information
-      about available character sets.
+      The <literal role="is">CHARACTER_SETS</literal> table provides
+      information about available character sets.
     </para>
 
     <informaltable>

@@ -1912,8 +1915,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">COLLATIONS</literal> table provides information about
-      collations for each character set.
+      The <literal role="is">COLLATIONS</literal> table provides
+      information about collations for each character set.
     </para>
 
     <informaltable>

@@ -2053,10 +2056,12 @@
     </indexterm>
 
     <para>
-      The <literal role="is">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 role="stmt">SHOW COLLATION</literal>.
+      The
+      <literal role="is">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 role="stmt">SHOW
+      COLLATION</literal>.
     </para>
 
     <informaltable>

@@ -2141,8 +2146,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLE_CONSTRAINTS</literal> table describes which
-      tables have constraints.
+      The <literal role="is">TABLE_CONSTRAINTS</literal> table describes
+      which tables have constraints.
     </para>
 
     <informaltable>

@@ -2275,8 +2280,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">KEY_COLUMN_USAGE</literal> table describes which key
-      columns have constraints.
+      The <literal role="is">KEY_COLUMN_USAGE</literal> table describes
+      which key columns have constraints.
     </para>
 
     <informaltable>

@@ -2412,8 +2417,9 @@
 </programlisting>
 
         <para>
-          For those two tables, the <literal role="is">KEY_COLUMN_USAGE</literal>
-          table has two rows:
+          For those two tables, the
+          <literal role="is">KEY_COLUMN_USAGE</literal> table has two
+          rows:
         </para>
 
         <itemizedlist>

@@ -2461,17 +2467,18 @@
     </indexterm>
 
     <para>
-      The <literal role="is">ROUTINES</literal> table provides information about
-      stored routines (both procedures and functions). The
-      <literal role="is">ROUTINES</literal> table does not include user-defined
-      functions (UDFs) at this time.
+      The <literal role="is">ROUTINES</literal> table provides
+      information about stored routines (both procedures and functions).
+      The <literal role="is">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 role="is">INFORMATION_SCHEMA.ROUTINES</literal>
-      table column, if any.
+      corresponds to the
+      <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table
+      column, if any.
     </para>
 
     <informaltable>

@@ -2899,9 +2906,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">VIEWS</literal> table provides information about
-      views in databases. You must have the <literal>SHOW VIEW</literal>
-      privilege to access this table.
+      The <literal role="is">VIEWS</literal> table provides information
+      about views in databases. You must have the <literal>SHOW
+      VIEW</literal> privilege to access this table.
     </para>
 
     <informaltable>

@@ -3032,10 +3039,10 @@
           are legal for the view. Otherwise, the flag is set to
           <literal>NO</literal> (false). The
           <literal>IS_UPDATABLE</literal> column in the
-          <literal role="is">VIEWS</literal> table displays the status of this
-          flag. It means that the server always knows whether a view is
-          updatable. If the view is not updatable, statements such
-          <literal role="stmt">UPDATE</literal>,
+          <literal role="is">VIEWS</literal> table displays the status
+          of this flag. It means that the server always knows whether a
+          view is updatable. If the view is not updatable, statements
+          such <literal role="stmt">UPDATE</literal>,
           <literal role="stmt">DELETE</literal>, and
           <literal role="stmt">INSERT</literal> are illegal and will be
           rejected. (Note that even if a view is updatable, it might not

@@ -3078,10 +3085,11 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TRIGGERS</literal> table provides information about
-      triggers. You must have the <literal>TRIGGER</literal> privilege
-      to access this table (prior to MySQL 5.1.22, you must have the
-      <literal>SUPER</literal> privilege).
+      The <literal role="is">TRIGGERS</literal> table provides
+      information about triggers. You must have the
+      <literal>TRIGGER</literal> privilege to access this table (prior
+      to MySQL 5.1.22, you must have the <literal>SUPER</literal>
+      privilege).
     </para>
 
     <remark role="note">

@@ -3409,8 +3417,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PLUGINS</literal> table provides information about
-      server plugins.
+      The <literal role="is">PLUGINS</literal> table provides
+      information about server plugins.
     </para>
 
     <informaltable>

@@ -3487,8 +3495,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">PLUGINS</literal> table is a non-standard table.
-          It was added in MySQL 5.1.5.
+          The <literal role="is">PLUGINS</literal> table is a
+          non-standard table. It was added in MySQL 5.1.5.
         </para>
       </listitem>
 

@@ -3517,8 +3525,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PLUGINS</literal> table provides information about
-      storage engines.
+      The <literal role="is">PLUGINS</literal> table provides
+      information about storage engines.
     </para>
 
     <informaltable>

@@ -3575,8 +3583,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">ENGINES</literal> table is a non-standard table.
-          It was added in MySQL 5.1.5.
+          The <literal role="is">ENGINES</literal> table is a
+          non-standard table. It was added in MySQL 5.1.5.
         </para>
       </listitem>
 

@@ -3598,9 +3606,10 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PARTITIONS</literal> table provides information about
-      table partitions. See <xref linkend="partitioning"/>, for more
-      information about partitioning tables.
+      The <literal role="is">PARTITIONS</literal> table provides
+      information about table partitions. See
+      <xref linkend="partitioning"/>, for more information about
+      partitioning tables.
     </para>
 
     <informaltable>

@@ -3752,8 +3761,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">PARTITIONS</literal> table is a non-standard
-          table. It was added in MySQL 5.1.6.
+          The <literal role="is">PARTITIONS</literal> table is a
+          non-standard table. It was added in MySQL 5.1.6.
         </para>
 
         <para>

@@ -3792,9 +3801,9 @@
       <listitem>
         <para>
           <literal>SUBPARTITION_NAME</literal>: If the
-          <literal role="is">PARTITIONS</literal> table record represents a
-          subpartition, then this column contains the name of
-          subpartition; otherwise it is <literal>NULL</literal>.
+          <literal role="is">PARTITIONS</literal> table record
+          represents a subpartition, then this column contains the name
+          of subpartition; otherwise it is <literal>NULL</literal>.
         </para>
       </listitem>
 

@@ -4052,8 +4061,8 @@
       <listitem>
         <para>
           A non-partitioned table has one record in
-          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>; however, the
-          values of the <literal>PARTITION_NAME</literal>,
+          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>;
+          however, the values of the <literal>PARTITION_NAME</literal>,
           <literal>SUBPARTITION_NAME</literal>,
           <literal>PARTITION_ORDINAL_POSITION</literal>,
           <literal>SUBPARTITION_ORDINAL_POSITION</literal>,

@@ -4069,10 +4078,10 @@
 
         <para>
           In MySQL &current-series;, there is also only one record in
-          the <literal role="is">PARTITIONS</literal> table for a table using the
-          <literal>NDBCLUSTER</literal> storage engine. The same columns
-          are also <literal>NULL</literal> (or empty) as for a
-          non-partitioned table.
+          the <literal role="is">PARTITIONS</literal> table for a table
+          using the <literal>NDBCLUSTER</literal> storage engine. The
+          same columns are also <literal>NULL</literal> (or empty) as
+          for a non-partitioned table.
         </para>
       </listitem>
 

@@ -4090,8 +4099,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">EVENTS</literal> table provides information about
-      scheduled events, which are discussed in <xref linkend="events"/>.
+      The <literal role="is">EVENTS</literal> table provides information
+      about scheduled events, which are discussed in
+      <xref linkend="events"/>.
     </para>
 
     <informaltable>

@@ -4238,8 +4248,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">EVENTS</literal> table is a non-standard table.
-          It was added in MySQL 5.1.6.
+          The <literal role="is">EVENTS</literal> table is a
+          non-standard table. It was added in MySQL 5.1.6.
         </para>
       </listitem>
 

@@ -4646,9 +4656,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">FILES</literal> table provides information about the
-      files in which MySQL <literal>NDB</literal> Disk Data tables are
-      stored.
+      The <literal role="is">FILES</literal> table provides information
+      about the files in which MySQL <literal>NDB</literal> Disk Data
+      tables are stored.
     </para>
 
     <informaltable>

@@ -5189,23 +5199,24 @@
 
       <listitem>
         <para>
-          The <literal role="is">FILES</literal> table is a non-standard table. It
-          was added in MySQL 5.1.6.
+          The <literal role="is">FILES</literal> table is a non-standard
+          table. It was added in MySQL 5.1.6.
         </para>
       </listitem>
 
       <listitem>
         <para>
           Beginning with MySQL 5.1.14, an additional row is present in
-          the <literal role="is">FILES</literal> table following the creation of a
-          logfile group. This row has <literal>NULL</literal> for the
-          value of the <literal>FILE_NAME</literal> column. For this
-          row, the value of the <literal>FILE_ID</literal> column is
-          always <literal>0</literal>, that of the
-          <literal>FILE_TYPE</literal> column is always <literal>UNDO
-          FILE</literal>, and that of the <literal>STATUS</literal>
-          column is always <literal>NORMAL</literal>. Currently, the
-          value of the <literal>ENGINE</literal> column is always
+          the <literal role="is">FILES</literal> table following the
+          creation of a logfile group. This row has
+          <literal>NULL</literal> for the value of the
+          <literal>FILE_NAME</literal> column. For this row, the value
+          of the <literal>FILE_ID</literal> column is always
+          <literal>0</literal>, that of the <literal>FILE_TYPE</literal>
+          column is always <literal>UNDO FILE</literal>, and that of the
+          <literal>STATUS</literal> column is always
+          <literal>NORMAL</literal>. Currently, the value of the
+          <literal>ENGINE</literal> column is always
           <literal>ndbcluster</literal>.
         </para>
 

@@ -5260,7 +5271,8 @@
           files in the log file group due to overhead required for
           maintaining the undo files. This can be seen by adding a
           second undo file to the log file group, then repeating the
-          previous query against the <literal role="is">FILES</literal> table:
+          previous query against the <literal role="is">FILES</literal>
+          table:
         </para>
 
 <programlisting>

@@ -5383,8 +5395,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PROCESSLIST</literal> table provides information
-      about which threads are running.
+      The <literal role="is">PROCESSLIST</literal> table provides
+      information about which threads are running.
     </para>
 
     <informaltable>

@@ -5456,29 +5468,29 @@
 
       <listitem>
         <para>
-          The <literal role="is">PROCESSLIST</literal> table is a non-standard
-          table. It was added in MySQL 5.1.7.
+          The <literal role="is">PROCESSLIST</literal> table is a
+          non-standard table. It was added in MySQL 5.1.7.
         </para>
       </listitem>
 
       <listitem>
         <para>
           Like the output from the corresponding <literal>SHOW</literal>
-          statement, the <literal role="is">PROCESSLIST</literal> table will only
-          show information about your own threads, unless you have the
-          <literal>PROCESS</literal> privilege, in which case you will
-          see information about other threads, too. As an anonymous
-          user, you cannot see any rows at all.
+          statement, the <literal role="is">PROCESSLIST</literal> table
+          will only show information about your own threads, unless you
+          have the <literal>PROCESS</literal> privilege, in which case
+          you will see information about other threads, too. As an
+          anonymous user, you cannot see any rows at all.
         </para>
       </listitem>
 
       <listitem>
         <para>
           If an SQL statement refers to
-          <literal role="is">INFORMATION_SCHEMA.PROCESSLIST</literal>, then MySQL
-          will populate the entire table once, when statement execution
-          begins, so there is read consistency during the statement.
-          There is no read consistency for a multi-statement
+          <literal role="is">INFORMATION_SCHEMA.PROCESSLIST</literal>,
+          then MySQL will populate the entire table once, when statement
+          execution begins, so there is read consistency during the
+          statement. There is no read consistency for a multi-statement
           transaction, though.
         </para>
       </listitem>

@@ -5507,8 +5519,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">REFERENTIAL_CONSTRAINTS</literal> table provides
-      information about foreign keys.
+      The <literal role="is">REFERENTIAL_CONSTRAINTS</literal> table
+      provides information about foreign keys.
     </para>
 
     <informaltable>

@@ -5590,9 +5602,10 @@
 
       <listitem>
         <para>
-          The <literal role="is">REFERENTIAL_CONSTRAINTS</literal> table was added
-          in MySQL 5.1.10. The <literal>REFERENCED_TABLE_NAME</literal>
-          column was added in MySQL 5.1.16.
+          The <literal role="is">REFERENTIAL_CONSTRAINTS</literal> table
+          was added in MySQL 5.1.10. The
+          <literal>REFERENCED_TABLE_NAME</literal> column was added in
+          MySQL 5.1.16.
         </para>
       </listitem>
 

@@ -5645,7 +5658,8 @@
   <section id="status-table">
 
     <title>The <literal>INFORMATION_SCHEMA GLOBAL_STATUS</literal> and
-      <literal role="is" condition="status">SESSION_STATUS</literal> Tables</title>
+      <literal role="is" condition="status">SESSION_STATUS</literal>
+      Tables</title>
 
     <indexterm>
       <primary>GLOBAL_STATUS</primary>

@@ -5658,12 +5672,12 @@
     </indexterm>
 
     <para>
-      The <literal role="is" condition="status">GLOBAL_STATUS</literal> and
-      <literal role="is" condition="status">SESSION_STATUS</literal> tables provide information about
-      server status variables. Their contents correspond to the
-      information produced by the <literal>SHOW GLOBAL STATUS</literal>
-      and <literal>SHOW SESSION STATUS</literal> statements (see
-      <xref linkend="show-status"/>).
+      The <literal role="is" condition="status">GLOBAL_STATUS</literal>
+      and <literal role="is" condition="status">SESSION_STATUS</literal>
+      tables provide information about server status variables. Their
+      contents correspond to the information produced by the
+      <literal>SHOW GLOBAL STATUS</literal> and <literal>SHOW SESSION
+      STATUS</literal> statements (see <xref linkend="show-status"/>).
     </para>
 
     <informaltable>

@@ -5700,9 +5714,11 @@
 
       <listitem>
         <para>
-          The <literal role="is" condition="status">GLOBAL_STATUS</literal> and
-          <literal role="is" condition="status">SESSION_STATUS</literal> tables were added in MySQL
-          5.1.12.
+          The
+          <literal role="is" condition="status">GLOBAL_STATUS</literal>
+          and
+          <literal role="is" condition="status">SESSION_STATUS</literal>
+          tables were added in MySQL 5.1.12.
         </para>
       </listitem>
 

@@ -5725,7 +5741,8 @@
   <section id="variables-table">
 
     <title>The <literal>INFORMATION_SCHEMA GLOBAL_VARIABLES</literal> and
-      <literal role="is" condition="variables">SESSION_VARIABLES</literal> Tables</title>
+      <literal role="is" condition="variables">SESSION_VARIABLES</literal>
+      Tables</title>
 
     <indexterm>
       <primary>GLOBAL_VARIABLES</primary>

@@ -5738,12 +5755,15 @@
     </indexterm>
 
     <para>
-      The <literal role="is" condition="variables">GLOBAL_VARIABLES</literal> and
-      <literal role="is" condition="variables">SESSION_VARIABLES</literal> tables provide information
-      about server status variables. Their contents correspond to the
-      information produced by the <literal>SHOW GLOBAL
-      VARIABLES</literal> and <literal>SHOW SESSION VARIABLES</literal>
-      statements (see <xref linkend="show-variables"/>).
+      The
+      <literal role="is" condition="variables">GLOBAL_VARIABLES</literal>
+      and
+      <literal role="is" condition="variables">SESSION_VARIABLES</literal>
+      tables provide information about server status variables. Their
+      contents correspond to the information produced by the
+      <literal>SHOW GLOBAL VARIABLES</literal> and <literal>SHOW SESSION
+      VARIABLES</literal> statements (see
+      <xref linkend="show-variables"/>).
     </para>
 
     <informaltable>

@@ -5780,9 +5800,11 @@
 
       <listitem>
         <para>
-          The <literal role="is" condition="variables">GLOBAL_VARIABLES</literal> and
-          <literal role="is" condition="variables">SESSION_VARIABLES</literal> tables were added in
-          MySQL 5.1.12.
+          The
+          <literal role="is" condition="variables">GLOBAL_VARIABLES</literal>
+          and
+          <literal role="is" condition="variables">SESSION_VARIABLES</literal>
+          tables were added in MySQL 5.1.12.
         </para>
       </listitem>
 

@@ -5794,10 +5816,11 @@
           Previously, this column had the data type
           <literal role="type">LONGTEXT</literal>; this was changed in
           order to make these tables consistent with the
-          <literal role="is" condition="status">GLOBAL_STATUS</literal> and
-          <literal role="is" condition="status">SESSION_STATUS</literal> tables, whose definitions
-          had been changed in that version (see
-          <xref linkend="status-table"/>).
+          <literal role="is" condition="status">GLOBAL_STATUS</literal>
+          and
+          <literal role="is" condition="status">SESSION_STATUS</literal>
+          tables, whose definitions had been changed in that version
+          (see <xref linkend="status-table"/>).
         </para>
       </listitem>
 

@@ -5815,9 +5838,10 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PROFILING</literal> table provides statement
-      profiling information. Its contents correspond to the information
-      produced by the <literal role="stmt">SHOW PROFILES</literal> and
+      The <literal role="is">PROFILING</literal> table provides
+      statement profiling information. Its contents correspond to the
+      information produced by the <literal role="stmt">SHOW
+      PROFILES</literal> and
       <literal role="stmt" condition="show-profiles">SHOW
       PROFILE</literal> statements (see
       <xref linkend="show-profiles"/>). The table is empty unless the

@@ -5938,8 +5962,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">PROFILING</literal> table was added in MySQL
-          5.1.24.
+          The <literal role="is">PROFILING</literal> table was added in
+          MySQL 5.1.24.
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/installing-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 755 bytes

@@ -13530,8 +13530,8 @@
               <para>
                 Upgrade to MySQL 5.0.10 or later to be able to access
                 trigger information in the
-                <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal> table.
-                (It should work even for pre-5.0.10 triggers.)
+                <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal>
+                table. (It should work even for pre-5.0.10 triggers.)
               </para>
             </listitem>
 


Modified: trunk/refman-5.1/internationalization.xml
===================================================================
--- trunk/refman-5.1/internationalization.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/internationalization.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 5; 1367 bytes

@@ -3121,10 +3121,10 @@
           contain information similar to that displayed by the
           <literal>SHOW</literal> statements. For example, the
           <literal role="is">CHARACTER_SETS</literal> and
-          <literal role="is">COLLATIONS</literal> tables contain the information
-          displayed by <literal role="stmt">SHOW CHARACTER SET</literal>
-          and <literal role="stmt">SHOW COLLATION</literal>. See
-          <xref linkend="information-schema"/>.
+          <literal role="is">COLLATIONS</literal> tables contain the
+          information displayed by <literal role="stmt">SHOW CHARACTER
+          SET</literal> and <literal role="stmt">SHOW
+          COLLATION</literal>. See <xref linkend="information-schema"/>.
         </para>
 
         <para>

@@ -6782,7 +6782,8 @@
         <listitem>
           <para>
             The <literal>ID</literal> column of the
-            <literal role="is">INFORMATION_SCHEMA.COLLATIONS</literal> table
+            <literal role="is">INFORMATION_SCHEMA.COLLATIONS</literal>
+            table
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/introduction.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 1355 bytes

@@ -628,7 +628,8 @@
               MySQL 5.1 provides much more information in its metadata
               database than was available in MySQL 5.0. New tables in
               the <literal>INFORMATION_SCHEMA</literal> database include
-              <literal role="is">FILES</literal>, <literal role="is">EVENTS</literal>,
+              <literal role="is">FILES</literal>,
+              <literal role="is">EVENTS</literal>,
               <literal role="is">PARTITIONS</literal>,
               <literal role="is">PROCESSLIST</literal>,
               <literal role="is">ENGINES</literal>, and

@@ -723,8 +724,8 @@
             <para>
               Improvements in the <literal>INFORMATION_SCHEMA</literal>
               database, with the addition of the
-              <literal role="is">INFORMATION_SCHEMA.PARAMETERS</literal> table,
-              and new columns added to
+              <literal role="is">INFORMATION_SCHEMA.PARAMETERS</literal>
+              table, and new columns added to
               <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal>.
             </para>
           </listitem>


Modified: trunk/refman-5.1/mysql-cluster-disk-data.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-disk-data.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/mysql-cluster-disk-data.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1398 bytes

@@ -480,8 +480,8 @@
 
     <para>
       You can obtain information about data files used by Disk Data
-      tables by querying the <literal role="is">FILES</literal> table in the
-      <literal>INFORMATION_SCHEMA</literal> database. An extra
+      tables by querying the <literal role="is">FILES</literal> table in
+      the <literal>INFORMATION_SCHEMA</literal> database. An extra
       <quote><literal>NULL</literal> row</quote> was added to this table
       in MySQL 5.1.14 for providing additional information about undo
       log files. For more information and examples of use, see

@@ -677,8 +677,9 @@
           <para>
             You can obtain an estimate the amount of space available in
             data files and undo log files by querying the
-            <literal role="is">INFORMATION_SCHEMA.FILES</literal> table. For more
-            information and examples, see <xref linkend="files-table"/>.
+            <literal role="is">INFORMATION_SCHEMA.FILES</literal> table.
+            For more information and examples, see
+            <xref linkend="files-table"/>.
           </para>
 
           <note>


Modified: trunk/refman-5.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-management.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/mysql-cluster-management.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 7; 1832 bytes

@@ -7017,8 +7017,9 @@
             In MySQL 5.1, this statement no longer supports a
             <literal role="op">LIKE</literal> clause. However, you can
             use <literal role="op">LIKE</literal> to filter queries
-            against the <literal role="is">INFORMATION_SCHEMA.ENGINES</literal>,
-            as discussed in the next item.
+            against the
+            <literal role="is">INFORMATION_SCHEMA.ENGINES</literal>, as
+            discussed in the next item.
           </para>
         </note>
       </listitem>

@@ -7036,11 +7037,12 @@
 
         <para>
           This is the equivalent of <literal role="stmt">SHOW
-          ENGINES</literal>, but uses the <literal role="is">ENGINES</literal>
-          table of the <literal>INFORMATION_SCHEMA</literal> database
-          (available beginning with MySQL 5.1.5). Unlike the case with
-          the <literal role="stmt">SHOW ENGINES</literal> statement, it
-          is possible to filter the results using a
+          ENGINES</literal>, but uses the
+          <literal role="is">ENGINES</literal> table of the
+          <literal>INFORMATION_SCHEMA</literal> database (available
+          beginning with MySQL 5.1.5). Unlike the case with the
+          <literal role="stmt">SHOW ENGINES</literal> statement, it is
+          possible to filter the results using a
           <literal role="op">LIKE</literal> clause, and to select
           specific columns to obtain information that may be of use in
           scripts. For example, the following query shows whether the


Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/optimization.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1372 bytes

@@ -6386,10 +6386,11 @@
         <literal>INFORMATION_SCHEMA</literal> tables shown in the
         following table, which shows the columns for which a constant
         lookup value enables the server to avoid a directory scan. For
-        example, if you are selecting from <literal role="is">TABLES</literal>,
-        using a constant lookup value for
-        <literal>TABLE_SCHEMA</literal> in the <literal>WHERE</literal>
-        clause enables a data directory scan to be avoided.
+        example, if you are selecting from
+        <literal role="is">TABLES</literal>, using a constant lookup
+        value for <literal>TABLE_SCHEMA</literal> in the
+        <literal>WHERE</literal> clause enables a data directory scan to
+        be avoided.
       </para>
 
       <informaltable>

@@ -6597,8 +6598,8 @@
 
         <listitem>
           <para>
-            <literal role="is">COLUMNS</literal>: <literal>OPEN_FRM_ONLY</literal>
-            applies to all columns
+            <literal role="is">COLUMNS</literal>:
+            <literal>OPEN_FRM_ONLY</literal> applies to all columns
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/partitioning-guide.xml
===================================================================
--- trunk/refman-5.1/partitioning-guide.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/partitioning-guide.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 8, Lines Added: 25, Lines Deleted: 23; 4638 bytes

@@ -295,20 +295,20 @@
     </para>
 
     <para>
-      The <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table, which
-      contains informatin about table partitions, is described in
-      <xref linkend="pg-information-schema"/>.
+      The <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+      table, which contains informatin about table partitions, is
+      described in <xref linkend="pg-information-schema"/>.
     </para>
 
     <important>
       <para>
         Partitioned tables created with MySQL versions prior to 5.1.6
         cannot be read by a 5.1.6 or later MySQL Server. In addition,
-        the <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table cannot be
-        used if such tables are present on a 5.1.6 server. Beginning
-        with MySQL 5.1.7, a suitable warning message is generated
-        instead, to alert the user that incompatible partitioned tables
-        have been found by the server.
+        the <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table
+        cannot be used if such tables are present on a 5.1.6 server.
+        Beginning with MySQL 5.1.7, a suitable warning message is
+        generated instead, to alert the user that incompatible
+        partitioned tables have been found by the server.
       </para>
     </important>
 

@@ -2017,7 +2017,8 @@
             the output of <literal role="stmt">SHOW CREATE
             TABLE</literal> or in the
             <literal>PARTITION_EXPRESSION</literal> column of the
-            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table.
+            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+            table.
           </para>
 
           <para>

@@ -3928,7 +3929,8 @@
         <listitem>
           <para>
             Querying the
-            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table.
+            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+            table.
           </para>
         </listitem>
 

@@ -5990,8 +5992,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PARTITIONS</literal> table provides information about
-      table partitions.
+      The <literal role="is">PARTITIONS</literal> table provides
+      information about table partitions.
     </para>
 
     <informaltable>

@@ -6143,8 +6145,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">PARTITIONS</literal> table is a non-standard
-          table. It was added in MySQL 5.1.6.
+          The <literal role="is">PARTITIONS</literal> table is a
+          non-standard table. It was added in MySQL 5.1.6.
         </para>
 
         <para>

@@ -6183,9 +6185,9 @@
       <listitem>
         <para>
           <literal>SUBPARTITION_NAME</literal>: If the
-          <literal role="is">PARTITIONS</literal> table record represents a
-          subpartition, then this column contains the name of
-          subpartition; otherwise it is <literal>NULL</literal>.
+          <literal role="is">PARTITIONS</literal> table record
+          represents a subpartition, then this column contains the name
+          of subpartition; otherwise it is <literal>NULL</literal>.
         </para>
       </listitem>
 

@@ -6443,8 +6445,8 @@
       <listitem>
         <para>
           A non-partitioned table has one record in
-          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>; however, the
-          values of the <literal>PARTITION_NAME</literal>,
+          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>;
+          however, the values of the <literal>PARTITION_NAME</literal>,
           <literal>SUBPARTITION_NAME</literal>,
           <literal>PARTITION_ORDINAL_POSITION</literal>,
           <literal>SUBPARTITION_ORDINAL_POSITION</literal>,

@@ -6460,10 +6462,10 @@
 
         <para>
           In MySQL &current-series;, there is also only one record in
-          the <literal role="is">PARTITIONS</literal> table for a table using the
-          <literal>NDBCLUSTER</literal> storage engine. The same columns
-          are also <literal>NULL</literal> (or empty) as for a
-          non-partitioned table.
+          the <literal role="is">PARTITIONS</literal> table for a table
+          using the <literal>NDBCLUSTER</literal> storage engine. The
+          same columns are also <literal>NULL</literal> (or empty) as
+          for a non-partitioned table.
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/partitioning.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 7, Lines Added: 24, Lines Deleted: 20; 4514 bytes

@@ -43,9 +43,10 @@
   </para>
 
   <para>
-    Beginning with MySQL 5.1.6, the <literal role="is">PARTITIONS</literal> table
-    in the <literal>INFORMATION_SCHEMA</literal> database provides
-    information about partitions and partitioned tables. See
+    Beginning with MySQL 5.1.6, the
+    <literal role="is">PARTITIONS</literal> table in the
+    <literal>INFORMATION_SCHEMA</literal> database provides information
+    about partitions and partitioned tables. See
     <xref linkend="partitions-table"/>, for more information; for some
     examples of queries against this table, see
     <xref linkend="partitioning-handling-nulls"/>.

@@ -55,11 +56,11 @@
     <para>
       Partitioned tables created with MySQL versions prior to 5.1.6
       cannot be read by a 5.1.6 or later MySQL Server. In addition, the
-      <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table cannot be used
-      if such tables are present on a 5.1.6 server. Beginning with MySQL
-      5.1.7, a suitable warning message is generated instead, to alert
-      the user that incompatible partitioned tables have been found by
-      the server.
+      <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table
+      cannot be used if such tables are present on a 5.1.6 server.
+      Beginning with MySQL 5.1.7, a suitable warning message is
+      generated instead, to alert the user that incompatible partitioned
+      tables have been found by the server.
     </para>
 
     <para>

@@ -1740,7 +1741,8 @@
             the output of <literal role="stmt">SHOW CREATE
             TABLE</literal> or in the
             <literal>PARTITION_EXPRESSION</literal> column of the
-            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table.
+            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+            table.
           </para>
 
           <para>

@@ -2276,8 +2278,9 @@
 
           You can see the partitions created by these two
           <literal role="stmt">CREATE TABLE</literal> statements using
-          the following query against the <literal role="is">PARTITIONS</literal>
-          table in the <literal>INFORMATION_SCHEMA</literal> database:
+          the following query against the
+          <literal role="is">PARTITIONS</literal> table in the
+          <literal>INFORMATION_SCHEMA</literal> database:
 
 <programlisting>
 mysql&gt; <userinput>SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS, AVG_ROW_LENGTH, DATA_LENGTH</userinput>

@@ -2502,11 +2505,11 @@
 </programlisting>
 
           By issuing the appropriate query against
-          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>, you can
-          determine which partitions were used to store the rows just
-          inserted (we assume, as in the previous examples, that the
-          partitioned tables were created in the <literal>p</literal>
-          database):
+          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>,
+          you can determine which partitions were used to store the rows
+          just inserted (we assume, as in the previous examples, that
+          the partitioned tables were created in the
+          <literal>p</literal> database):
 
 <programlisting>
 mysql&gt; <userinput>SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS, AVG_ROW_LENGTH, DATA_LENGTH</userinput>

@@ -2605,9 +2608,9 @@
           <literal>HASH</literal> or <literal>KEY</literal>, this result
           is treated for determining the correct partition as
           <literal>0</literal>. Checking the
-          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table once
-          again, we can see that both rows were inserted into partition
-          <literal>p0</literal>:
+          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+          table once again, we can see that both rows were inserted into
+          partition <literal>p0</literal>:
 
 <programlisting>
 mysql&gt; <userinput>SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS, AVG_ROW_LENGTH, DATA_LENGTH</userinput>

@@ -3630,7 +3633,8 @@
         <listitem>
           <para>
             Querying the
-            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table.
+            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+            table.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/replication-notes.xml
===================================================================
--- trunk/refman-5.1/replication-notes.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/replication-notes.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1308 bytes

@@ -1048,8 +1048,8 @@
                     The master on which the event was created is
                     identified on the slave by its server ID. The
                     <literal>ORIGINATOR</literal> column in
-                    <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> and the
-                    <literal>originator</literal> column in
+                    <literal role="is">INFORMATION_SCHEMA.EVENTS</literal>
+                    and the <literal>originator</literal> column in
                     <literal>mysql.event</literal> were added to these
                     tables in MySQL 5.1.18 to store this information.
                     (See <xref linkend="events-table"/>, and

@@ -1084,8 +1084,8 @@
 </programlisting>
 
         Alternatively, you might wish to query the
-        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table as shown
-        here:
+        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table as
+        shown here:
 
 <programlisting>
 SELECT EVENT_SCHEMA, EVENT_NAME, ORIGINATOR


Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/restrictions.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 9; 1739 bytes

@@ -437,10 +437,11 @@
       <listitem>
         <para>
           Prior to MySQL 5.1.12, you could not view another user's
-          events in the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal>
-          table. In other words, any query made against this table was
-          treated as though it contained the condition <literal>DEFINER
-          = CURRENT_USER()</literal> in the <literal>WHERE</literal>
+          events in the
+          <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table.
+          In other words, any query made against this table was treated
+          as though it contained the condition <literal>DEFINER =
+          CURRENT_USER()</literal> in the <literal>WHERE</literal>
           clause.
         </para>
       </listitem>

@@ -458,11 +459,12 @@
 
       <listitem>
         <para>
-          In MySQL 5.1.6, <literal role="is">INFORMATION_SCHEMA.EVENTS</literal>
-          shows <literal>NULL</literal> in the
-          <literal>SQL_MODE</literal> column. Beginning with MySQL
-          5.1.7, the <literal>SQL_MODE</literal> displayed is that in
-          effect when the event was created.
+          In MySQL 5.1.6,
+          <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> shows
+          <literal>NULL</literal> in the <literal>SQL_MODE</literal>
+          column. Beginning with MySQL 5.1.7, the
+          <literal>SQL_MODE</literal> displayed is that in effect when
+          the event was created.
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/se-innodb-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 8; 1655 bytes

@@ -1856,14 +1856,15 @@
           <literal role="stmt">SHOW TABLE STATUS</literal> or
           <literal role="stmt">SHOW INDEX</literal>, or when accessing
           the <literal>INFORMATION_SCHEMA</literal> tables
-          <literal role="is">TABLES</literal> or <literal role="is">STATISTICS</literal>.
-          (These updates are similar to what happens for
-          <literal role="stmt">ANALYZE TABLE</literal>.) When disabled,
-          <literal>InnoDB</literal> does not updates statistics during
-          these operations. Disabling this variable can improve access
-          speed for schemas that have a large number of tables or
-          indexes. It can also improve the stability of execution plans
-          for queries that involve <literal>InnoDB</literal> tables.
+          <literal role="is">TABLES</literal> or
+          <literal role="is">STATISTICS</literal>. (These updates are
+          similar to what happens for <literal role="stmt">ANALYZE
+          TABLE</literal>.) When disabled, <literal>InnoDB</literal>
+          does not updates statistics during these operations. Disabling
+          this variable can improve access speed for schemas that have a
+          large number of tables or indexes. It can also improve the
+          stability of execution plans for queries that involve
+          <literal>InnoDB</literal> tables.
         </para>
 
         <para>


Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 5, Lines Added: 11, Lines Deleted: 9; 2666 bytes

@@ -484,7 +484,8 @@
       file is created on each Cluster data node. You can verify that the
       <literal>UNDO</literal> files were created and obtain information
       about them by querying the
-      <literal role="is">INFORMATION_SCHEMA.FILES</literal> table. For example:
+      <literal role="is">INFORMATION_SCHEMA.FILES</literal> table. For
+      example:
     </para>
 
 <programlisting>

@@ -2499,8 +2500,8 @@
       with <literal>ENGINE = NDB</literal>, a data file is created on
       each Cluster data node. You can verify that the data files were
       created and obtain information about them by querying the
-      <literal role="is">INFORMATION_SCHEMA.FILES</literal> table. For example,
-      the following query shows all data files belonging to the
+      <literal role="is">INFORMATION_SCHEMA.FILES</literal> table. For
+      example, the following query shows all data files belonging to the
       tablespace named <literal>newts</literal>:
     </para>
 

@@ -3898,7 +3899,8 @@
       each Cluster data node. You can verify that the
       <literal>UNDO</literal> files were created and obtain information
       about them by querying the
-      <literal role="is">INFORMATION_SCHEMA.FILES</literal> table. For example:
+      <literal role="is">INFORMATION_SCHEMA.FILES</literal> table. For
+      example:
     </para>
 
 <programlisting>

@@ -7187,9 +7189,9 @@
 
     <para>
       You can see how many extents remain free in a given data file by
-      querying the <literal role="is">INFORMATION_SCHEMA.FILES</literal> table,
-      and so derive an estimate for how much space remains free in the
-      file. For further discussion and examples, see
+      querying the <literal role="is">INFORMATION_SCHEMA.FILES</literal>
+      table, and so derive an estimate for how much space remains free
+      in the file. For further discussion and examples, see
       <xref linkend="files-table"/>.
     </para>
 

@@ -7244,8 +7246,8 @@
       <literal>ENGINE = NDB</literal>, a tablespace and associated data
       file are created on each Cluster data node. You can verify that
       the data files were created and obtain information about them by
-      querying the <literal role="is">INFORMATION_SCHEMA.FILES</literal> table.
-      For example:
+      querying the <literal role="is">INFORMATION_SCHEMA.FILES</literal>
+      table. For example:
     </para>
 
 <programlisting>


Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 9; 1964 bytes

@@ -5926,8 +5926,8 @@
         The columns in the output of <literal role="stmt">SHOW
         EVENTS</literal> &mdash; which are similar to, but not identical
         to the columns in the
-        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table &mdash; are
-        shown here:
+        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table
+        &mdash; are shown here:
       </para>
 
       <itemizedlist>

@@ -6990,13 +6990,13 @@
         <literal role="stmt">SHOW PROCESSLIST</literal> shows you which
         threads are running. You can also get this information from the
         <literal>INFORMATION_SCHEMA</literal>
-        <literal role="is">PROCESSLIST</literal> table or the <command>mysqladmin
-        processlist</command> command. If you have the
-        <literal>PROCESS</literal> privilege, you can see all threads.
-        Otherwise, you can see only your own threads (that is, threads
-        associated with the MySQL account that you are using). If you do
-        not use the <literal>FULL</literal> keyword, only the first 100
-        characters of each statement are shown in the
+        <literal role="is">PROCESSLIST</literal> table or the
+        <command>mysqladmin processlist</command> command. If you have
+        the <literal>PROCESS</literal> privilege, you can see all
+        threads. Otherwise, you can see only your own threads (that is,
+        threads associated with the MySQL account that you are using).
+        If you do not use the <literal>FULL</literal> keyword, only the
+        first 100 characters of each statement are shown in the
         <literal>Info</literal> field.
       </para>
 


Modified: trunk/refman-5.1/views.xml
===================================================================
--- trunk/refman-5.1/views.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1/views.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 826 bytes

@@ -638,7 +638,8 @@
       <literal role="stmt">DELETE</literal> (and similar operations) are
       legal for the view. Otherwise, the flag is set to
       <literal>NO</literal> (false). The <literal>IS_UPDATABLE</literal>
-      column in the <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table
+      column in the
+      <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table
       displays the status of this flag. It means that the server always
       knows whether a view is updatable. If the view is not updatable,
       statements such <literal role="stmt">UPDATE</literal>,


Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 9; 1982 bytes

@@ -5980,8 +5980,8 @@
         The columns in the output of <literal role="stmt">SHOW
         EVENTS</literal> &mdash; which are similar to, but not identical
         to the columns in the
-        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table &mdash; are
-        shown here:
+        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table
+        &mdash; are shown here:
       </para>
 
       <itemizedlist>

@@ -7038,13 +7038,13 @@
         <literal role="stmt">SHOW PROCESSLIST</literal> shows you which
         threads are running. You can also get this information from the
         <literal>INFORMATION_SCHEMA</literal>
-        <literal role="is">PROCESSLIST</literal> table or the <command>mysqladmin
-        processlist</command> command. If you have the
-        <literal>PROCESS</literal> privilege, you can see all threads.
-        Otherwise, you can see only your own threads (that is, threads
-        associated with the MySQL account that you are using). If you do
-        not use the <literal>FULL</literal> keyword, only the first 100
-        characters of each statement are shown in the
+        <literal role="is">PROCESSLIST</literal> table or the
+        <command>mysqladmin processlist</command> command. If you have
+        the <literal>PROCESS</literal> privilege, you can see all
+        threads. Otherwise, you can see only your own threads (that is,
+        threads associated with the MySQL account that you are using).
+        If you do not use the <literal>FULL</literal> keyword, only the
+        first 100 characters of each statement are shown in the
         <literal>Info</literal> field.
       </para>
 


Modified: trunk/refman-6.0/apis-c.xml
===================================================================
--- trunk/refman-6.0/apis-c.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/apis-c.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 891 bytes

@@ -663,9 +663,10 @@
           <literal role="stmt">SHOW COLLATION</literal> statement or the
           <literal>ID</literal> column of the
           <literal>INFORMATION_SCHEMA</literal>
-          <literal role="is">COLLATIONS</literal> table. You can use those
-          information sources to see which character set and collation
-          specific <literal>charsetnr</literal> values indicate:
+          <literal role="is">COLLATIONS</literal> table. You can use
+          those information sources to see which character set and
+          collation specific <literal>charsetnr</literal> values
+          indicate:
         </para>
 
 <programlisting>


Modified: trunk/refman-6.0/collation-tmp.xml
===================================================================
--- trunk/refman-6.0/collation-tmp.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/collation-tmp.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 544 bytes

@@ -570,7 +570,8 @@
           </remark>
 
           The <literal>ID</literal> column of the
-          <literal role="is">INFORMATION_SCHEMA.COLLATIONS</literal> table
+          <literal role="is">INFORMATION_SCHEMA.COLLATIONS</literal>
+          table
         </para>
       </listitem>
 


Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/dba-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1227 bytes

@@ -8726,14 +8726,15 @@
 
           <para>
             The purpose of these variables is to support replication of
-            the <literal role="func">RAND()</literal> function. For statements that
-            invoke <literal role="func">RAND()</literal>, the master passes two
+            the <literal role="func">RAND()</literal> function. For
+            statements that invoke
+            <literal role="func">RAND()</literal>, the master passes two
             values to the slave, where they are used to seed the random
             number generator. The slave uses these values to set the
             session variables <literal>rand_seed1</literal> and
             <literal>rand_seed2</literal> so that
-            <literal role="func">RAND()</literal> on the slave generates the same
-            value as on the master.
+            <literal role="func">RAND()</literal> on the slave generates
+            the same value as on the master.
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/events.xml
===================================================================
--- trunk/refman-6.0/events.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/events.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 11; 2168 bytes

@@ -474,12 +474,12 @@
     </para>
 
     <para>
-      MySQL &current-series; provides an <literal role="is">EVENTS</literal> table
-      in the <literal>INFORMATION_SCHEMA</literal> database. This table
-      can be queried to obtain information about scheduled events which
-      have been defined on the server. See
-      <xref linkend="events-metadata"/>, and
-      <xref linkend="events-table"/>, for more information.
+      MySQL &current-series; provides an
+      <literal role="is">EVENTS</literal> table in the
+      <literal>INFORMATION_SCHEMA</literal> database. This table can be
+      queried to obtain information about scheduled events which have
+      been defined on the server. See <xref linkend="events-metadata"/>,
+      and <xref linkend="events-table"/>, for more information.
     </para>
 
     <para>

@@ -769,9 +769,10 @@
     </indexterm>
 
     <para>
-      Inspection of the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal>
-      table shows that <literal>e_store_ts</literal> exists and is
-      enabled, but its <literal>LAST_EXECUTED</literal> column is
+      Inspection of the
+      <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table shows
+      that <literal>e_store_ts</literal> exists and is enabled, but its
+      <literal>LAST_EXECUTED</literal> column is
       <literal>NULL</literal>:
     </para>
 

@@ -873,8 +874,9 @@
     <para>
       You can verify that this is true by examining the
       <literal>mysql.event</literal> table (discussed later in this
-      section) or the <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table
-      (see <xref linkend="events-table"/>) before and after issuing a
+      section) or the
+      <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table (see
+      <xref linkend="events-table"/>) before and after issuing a
       <literal role="stmt">DROP USER</literal> or
       <literal role="stmt">RENAME USER</literal> statement.
     </para>


Modified: trunk/refman-6.0/extending-mysql.xml
===================================================================
--- trunk/refman-6.0/extending-mysql.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/extending-mysql.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1026 bytes

@@ -908,9 +908,9 @@
             <para>
               The plugin version number. When the plugin is installed,
               this value can be retrieved from the
-              <literal role="is">INFORMATION_SCHEMA.PLUGINS</literal> table. The
-              value includes major and minor numbers. If you write the
-              value as a hex constant, the format is
+              <literal role="is">INFORMATION_SCHEMA.PLUGINS</literal>
+              table. The value includes major and minor numbers. If you
+              write the value as a hex constant, the format is
               <literal>0x<replaceable>MMNN</replaceable></literal>,
               where <replaceable>MM</replaceable> and
               <literal>NN</literal> are the major and minor numbers,


Modified: trunk/refman-6.0/faqs.xml
===================================================================
--- trunk/refman-6.0/faqs.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/faqs.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 6, Lines Added: 14, Lines Deleted: 12; 3000 bytes

@@ -763,7 +763,8 @@
           <para>
             Yes. For a database named <replaceable>dbname</replaceable>,
             use this query on the
-            <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table:
+            <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal>
+            table:
           </para>
 
 <programlisting>

@@ -814,10 +815,10 @@
           </para>
 
           <para>
-            You can also query the <literal role="is">ROUTINES</literal> table in
-            the <literal>INFORMATION_SCHEMA</literal> database &mdash;
-            see <xref linkend="routines-table"/>, for information about
-            this table.
+            You can also query the <literal role="is">ROUTINES</literal>
+            table in the <literal>INFORMATION_SCHEMA</literal> database
+            &mdash; see <xref linkend="routines-table"/>, for
+            information about this table.
           </para>
 
         </answer>

@@ -1505,8 +1506,8 @@
 
           <para>
             Information about triggers can be obtained by querying the
-            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal> table. See
-            <xref linkend="triggers-table"/>.
+            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal>
+            table. See <xref linkend="triggers-table"/>.
           </para>
 
         </answer>

@@ -1528,8 +1529,8 @@
           <para>
             Yes. You can obtain a listing of all triggers defined on
             database <literal>dbname</literal> using a query on the
-            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal> table such as
-            the one shown here:
+            <literal role="is">INFORMATION_SCHEMA.TRIGGERS</literal>
+            table such as the one shown here:
           </para>
 
 <programlisting>

@@ -3253,7 +3254,8 @@
             character set was not supported prior to MySQL 5.0.3.
             However, since the name of the applicable language appears
             in the <literal>DESCRIPTION</literal> column for every entry
-            in the <literal role="is">INFORMATION_SCHEMA.CHARACTER_SETS</literal>
+            in the
+            <literal role="is">INFORMATION_SCHEMA.CHARACTER_SETS</literal>
             table, you can obtain a current list of all the non-Unicode
             CJK character sets using this query:
 

@@ -4871,8 +4873,8 @@
 
             Since the character set appears to be correct, let's see
             what information the
-            <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal> table can
-            provide about this column:
+            <literal role="is">INFORMATION_SCHEMA.COLUMNS</literal>
+            table can provide about this column:
 
 <programlisting>
 mysql&gt; <userinput>SELECT COLUMN_NAME, CHARACTER_SET_NAME, COLLATION_NAME</userinput>


Modified: trunk/refman-6.0/information-schema.xml
===================================================================
--- trunk/refman-6.0/information-schema.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/information-schema.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 42, Lines Added: 133, Lines Deleted: 114; 20821 bytes

@@ -107,8 +107,9 @@
     only the rows in the tables that correspond to objects for which the
     user has the proper access privileges. In some cases (for example,
     the <literal>ROUTINE_DEFINITION</literal> column in the
-    <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table), users who
-    have insufficient privileges will see <literal>NULL</literal>.
+    <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table),
+    users who have insufficient privileges will see
+    <literal>NULL</literal>.
   </para>
 
   <para>

@@ -192,7 +193,8 @@
     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>
-    column in the <literal role="is">INFORMATION_SCHEMA.TABLES</literal> table.
+    column in the <literal role="is">INFORMATION_SCHEMA.TABLES</literal>
+    table.
   </para>
 
   <para>

@@ -251,8 +253,8 @@
     SQL Server, or Oracle, we changed the names of some columns marked
     <quote>MySQL extension</quote>. (For example, we changed
     <literal>COLLATION</literal> to <literal>TABLE_COLLATION</literal>
-    in the <literal role="is">TABLES</literal> table.) See the list of reserved
-    words near the end of this article:
+    in the <literal role="is">TABLES</literal> table.) See the list of
+    reserved words near the end of this article:
     <ulink url="http://web.archive.org/web/20030201202307/www.dbazine.com/gulutzan5.html"/>.
   </para>
 

@@ -306,8 +308,9 @@
     </indexterm>
 
     <para>
-      A schema is a database, so the <literal role="is">SCHEMATA</literal> table
-      provides information about databases.
+      A schema is a database, so the
+      <literal role="is">SCHEMATA</literal> table provides information
+      about databases.
     </para>
 
     <informaltable>

@@ -409,8 +412,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLES</literal> table provides information about
-      tables in databases.
+      The <literal role="is">TABLES</literal> table provides information
+      about tables in databases.
     </para>
 
     <informaltable>

@@ -700,8 +703,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">COLUMNS</literal> table provides information about
-      columns in tables.
+      The <literal role="is">COLUMNS</literal> table provides
+      information about columns in tables.
     </para>
 
     <informaltable>

@@ -1207,8 +1210,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">STATISTICS</literal> table provides information about
-      table indexes.
+      The <literal role="is">STATISTICS</literal> table provides
+      information about table indexes.
     </para>
 
     <informaltable>

@@ -1400,9 +1403,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">USER_PRIVILEGES</literal> table provides information
-      about global privileges. This information comes from the
-      <literal>mysql.user</literal> grant table.
+      The <literal role="is">USER_PRIVILEGES</literal> table provides
+      information about global privileges. This information comes from
+      the <literal>mysql.user</literal> grant table.
     </para>
 
     <informaltable>

@@ -1543,9 +1546,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLE_PRIVILEGES</literal> table provides information
-      about table privileges. This information comes from the
-      <literal>mysql.tables_priv</literal> grant table.
+      The <literal role="is">TABLE_PRIVILEGES</literal> table provides
+      information about table privileges. This information comes from
+      the <literal>mysql.tables_priv</literal> grant table.
     </para>
 
     <informaltable>

@@ -1738,8 +1741,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 role="is">COLUMN_PRIVILEGES</literal>, there is one privilege
-          per row, in uppercase.
+          <literal role="is">COLUMN_PRIVILEGES</literal>, there is one
+          privilege per row, in uppercase.
         </para>
       </listitem>
 

@@ -1788,8 +1791,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">CHARACTER_SETS</literal> table provides information
-      about available character sets.
+      The <literal role="is">CHARACTER_SETS</literal> table provides
+      information about available character sets.
     </para>
 
     <informaltable>

@@ -1929,8 +1932,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">COLLATIONS</literal> table provides information about
-      collations for each character set.
+      The <literal role="is">COLLATIONS</literal> table provides
+      information about collations for each character set.
     </para>
 
     <informaltable>

@@ -2070,10 +2073,12 @@
     </indexterm>
 
     <para>
-      The <literal role="is">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 role="stmt">SHOW COLLATION</literal>.
+      The
+      <literal role="is">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 role="stmt">SHOW
+      COLLATION</literal>.
     </para>
 
     <informaltable>

@@ -2158,8 +2163,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TABLE_CONSTRAINTS</literal> table describes which
-      tables have constraints.
+      The <literal role="is">TABLE_CONSTRAINTS</literal> table describes
+      which tables have constraints.
     </para>
 
     <informaltable>

@@ -2292,8 +2297,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">KEY_COLUMN_USAGE</literal> table describes which key
-      columns have constraints.
+      The <literal role="is">KEY_COLUMN_USAGE</literal> table describes
+      which key columns have constraints.
     </para>
 
     <informaltable>

@@ -2429,8 +2434,9 @@
 </programlisting>
 
         <para>
-          For those two tables, the <literal role="is">KEY_COLUMN_USAGE</literal>
-          table has two rows:
+          For those two tables, the
+          <literal role="is">KEY_COLUMN_USAGE</literal> table has two
+          rows:
         </para>
 
         <itemizedlist>

@@ -2478,17 +2484,18 @@
     </indexterm>
 
     <para>
-      The <literal role="is">ROUTINES</literal> table provides information about
-      stored routines (both procedures and functions). The
-      <literal role="is">ROUTINES</literal> table does not include user-defined
-      functions (UDFs) at this time.
+      The <literal role="is">ROUTINES</literal> table provides
+      information about stored routines (both procedures and functions).
+      The <literal role="is">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 role="is">INFORMATION_SCHEMA.ROUTINES</literal>
-      table column, if any.
+      corresponds to the
+      <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> table
+      column, if any.
     </para>
 
     <informaltable>

@@ -2954,9 +2961,10 @@
         <para>
           Information about stored function <literal>RETURNS</literal>
           data types is also available in the
-          <literal role="is">PARAMETERS</literal> table. The return value data
-          type row for a function can be identified as the row that has
-          an <literal>ORDINAL_POSITION</literal> value of 0.
+          <literal role="is">PARAMETERS</literal> table. The return
+          value data type row for a function can be identified as the
+          row that has an <literal>ORDINAL_POSITION</literal> value of
+          0.
         </para>
       </listitem>
 

@@ -2974,9 +2982,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">VIEWS</literal> table provides information about
-      views in databases. You must have the <literal>SHOW VIEW</literal>
-      privilege to access this table.
+      The <literal role="is">VIEWS</literal> table provides information
+      about views in databases. You must have the <literal>SHOW
+      VIEW</literal> privilege to access this table.
     </para>
 
     <informaltable>

@@ -3107,10 +3115,10 @@
           are legal for the view. Otherwise, the flag is set to
           <literal>NO</literal> (false). The
           <literal>IS_UPDATABLE</literal> column in the
-          <literal role="is">VIEWS</literal> table displays the status of this
-          flag. It means that the server always knows whether a view is
-          updatable. If the view is not updatable, statements such
-          <literal role="stmt">UPDATE</literal>,
+          <literal role="is">VIEWS</literal> table displays the status
+          of this flag. It means that the server always knows whether a
+          view is updatable. If the view is not updatable, statements
+          such <literal role="stmt">UPDATE</literal>,
           <literal role="stmt">DELETE</literal>, and
           <literal role="stmt">INSERT</literal> are illegal and will be
           rejected. (Note that even if a view is updatable, it might not

@@ -3152,9 +3160,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">TRIGGERS</literal> table provides information about
-      triggers. You must have the <literal>TRIGGER</literal> privilege
-      to access this table.
+      The <literal role="is">TRIGGERS</literal> table provides
+      information about triggers. You must have the
+      <literal>TRIGGER</literal> privilege to access this table.
     </para>
 
     <remark role="note">

@@ -3480,8 +3488,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PLUGINS</literal> table provides information about
-      server plugins.
+      The <literal role="is">PLUGINS</literal> table provides
+      information about server plugins.
     </para>
 
     <informaltable>

@@ -3558,7 +3566,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">PLUGINS</literal> table is a non-standard table.
+          The <literal role="is">PLUGINS</literal> table is a
+          non-standard table.
         </para>
       </listitem>
 

@@ -3580,8 +3589,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PLUGINS</literal> table provides information about
-      storage engines.
+      The <literal role="is">PLUGINS</literal> table provides
+      information about storage engines.
     </para>
 
     <informaltable>

@@ -3638,7 +3647,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">ENGINES</literal> table is a non-standard table.
+          The <literal role="is">ENGINES</literal> table is a
+          non-standard table.
         </para>
       </listitem>
 

@@ -3660,9 +3670,10 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PARTITIONS</literal> table provides information about
-      table partitions. See <xref linkend="partitioning"/>, for more
-      information about partitioning tables.
+      The <literal role="is">PARTITIONS</literal> table provides
+      information about table partitions. See
+      <xref linkend="partitioning"/>, for more information about
+      partitioning tables.
     </para>
 
     <informaltable>

@@ -3814,8 +3825,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">PARTITIONS</literal> table is a non-standard
-          table.
+          The <literal role="is">PARTITIONS</literal> table is a
+          non-standard table.
         </para>
 
         <para>

@@ -3854,9 +3865,9 @@
       <listitem>
         <para>
           <literal>SUBPARTITION_NAME</literal>: If the
-          <literal role="is">PARTITIONS</literal> table record represents a
-          subpartition, then this column contains the name of
-          subpartition; otherwise it is <literal>NULL</literal>.
+          <literal role="is">PARTITIONS</literal> table record
+          represents a subpartition, then this column contains the name
+          of subpartition; otherwise it is <literal>NULL</literal>.
         </para>
       </listitem>
 

@@ -4109,8 +4120,8 @@
       <listitem>
         <para>
           A non-partitioned table has one record in
-          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>; however, the
-          values of the <literal>PARTITION_NAME</literal>,
+          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>;
+          however, the values of the <literal>PARTITION_NAME</literal>,
           <literal>SUBPARTITION_NAME</literal>,
           <literal>PARTITION_ORDINAL_POSITION</literal>,
           <literal>SUBPARTITION_ORDINAL_POSITION</literal>,

@@ -4139,8 +4150,9 @@
     </indexterm>
 
     <para>
-      The <literal role="is">EVENTS</literal> table provides information about
-      scheduled events, which are discussed in <xref linkend="events"/>.
+      The <literal role="is">EVENTS</literal> table provides information
+      about scheduled events, which are discussed in
+      <xref linkend="events"/>.
     </para>
 
     <informaltable>

@@ -4287,7 +4299,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">EVENTS</literal> table is a non-standard table.
+          The <literal role="is">EVENTS</literal> table is a
+          non-standard table.
         </para>
       </listitem>
 

@@ -4660,8 +4673,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PROCESSLIST</literal> table provides information
-      about which threads are running.
+      The <literal role="is">PROCESSLIST</literal> table provides
+      information about which threads are running.
     </para>
 
     <informaltable>

@@ -4733,29 +4746,29 @@
 
       <listitem>
         <para>
-          The <literal role="is">PROCESSLIST</literal> table is a non-standard
-          table.
+          The <literal role="is">PROCESSLIST</literal> table is a
+          non-standard table.
         </para>
       </listitem>
 
       <listitem>
         <para>
           Like the output from the corresponding <literal>SHOW</literal>
-          statement, the <literal role="is">PROCESSLIST</literal> table will only
-          show information about your own threads, unless you have the
-          <literal>PROCESS</literal> privilege, in which case you will
-          see information about other threads, too. As an anonymous
-          user, you cannot see any rows at all.
+          statement, the <literal role="is">PROCESSLIST</literal> table
+          will only show information about your own threads, unless you
+          have the <literal>PROCESS</literal> privilege, in which case
+          you will see information about other threads, too. As an
+          anonymous user, you cannot see any rows at all.
         </para>
       </listitem>
 
       <listitem>
         <para>
           If an SQL statement refers to
-          <literal role="is">INFORMATION_SCHEMA.PROCESSLIST</literal>, then MySQL
-          will populate the entire table once, when statement execution
-          begins, so there is read consistency during the statement.
-          There is no read consistency for a multi-statement
+          <literal role="is">INFORMATION_SCHEMA.PROCESSLIST</literal>,
+          then MySQL will populate the entire table once, when statement
+          execution begins, so there is read consistency during the
+          statement. There is no read consistency for a multi-statement
           transaction, though.
         </para>
       </listitem>

@@ -4784,8 +4797,8 @@
     </indexterm>
 
     <para>
-      The <literal role="is">REFERENTIAL_CONSTRAINTS</literal> table provides
-      information about foreign keys.
+      The <literal role="is">REFERENTIAL_CONSTRAINTS</literal> table
+      provides information about foreign keys.
     </para>
 
     <informaltable>

@@ -4912,7 +4925,8 @@
   <section id="status-table">
 
     <title>The <literal>INFORMATION_SCHEMA GLOBAL_STATUS</literal> and
-      <literal role="is" condition="status">SESSION_STATUS</literal> Tables</title>
+      <literal role="is" condition="status">SESSION_STATUS</literal>
+      Tables</title>
 
     <indexterm>
       <primary>GLOBAL_STATUS</primary>

@@ -4925,12 +4939,12 @@
     </indexterm>
 
     <para>
-      The <literal role="is" condition="status">GLOBAL_STATUS</literal> and
-      <literal role="is" condition="status">SESSION_STATUS</literal> tables provide information about
-      server status variables. Their contents correspond to the
-      information produced by the <literal>SHOW GLOBAL STATUS</literal>
-      and <literal>SHOW SESSION STATUS</literal> statements (see
-      <xref linkend="show-status"/>).
+      The <literal role="is" condition="status">GLOBAL_STATUS</literal>
+      and <literal role="is" condition="status">SESSION_STATUS</literal>
+      tables provide information about server status variables. Their
+      contents correspond to the information produced by the
+      <literal>SHOW GLOBAL STATUS</literal> and <literal>SHOW SESSION
+      STATUS</literal> statements (see <xref linkend="show-status"/>).
     </para>
 
     <informaltable>

@@ -4979,7 +4993,8 @@
   <section id="variables-table">
 
     <title>The <literal>INFORMATION_SCHEMA GLOBAL_VARIABLES</literal> and
-      <literal role="is" condition="variables">SESSION_VARIABLES</literal> Tables</title>
+      <literal role="is" condition="variables">SESSION_VARIABLES</literal>
+      Tables</title>
 
     <indexterm>
       <primary>GLOBAL_VARIABLES</primary>

@@ -4992,12 +5007,15 @@
     </indexterm>
 
     <para>
-      The <literal role="is" condition="variables">GLOBAL_VARIABLES</literal> and
-      <literal role="is" condition="variables">SESSION_VARIABLES</literal> tables provide information
-      about server status variables. Their contents correspond to the
-      information produced by the <literal>SHOW GLOBAL
-      VARIABLES</literal> and <literal>SHOW SESSION VARIABLES</literal>
-      statements (see <xref linkend="show-variables"/>).
+      The
+      <literal role="is" condition="variables">GLOBAL_VARIABLES</literal>
+      and
+      <literal role="is" condition="variables">SESSION_VARIABLES</literal>
+      tables provide information about server status variables. Their
+      contents correspond to the information produced by the
+      <literal>SHOW GLOBAL VARIABLES</literal> and <literal>SHOW SESSION
+      VARIABLES</literal> statements (see
+      <xref linkend="show-variables"/>).
     </para>
 
     <informaltable>

@@ -5053,11 +5071,11 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PARAMETERS</literal> table provides information about
-      stored function and procedure parameters, and about return values
-      for stored functions. Parameter information is similar to the
-      contents of the <literal>param_list</literal> column in the
-      <literal>mysql.proc</literal> table.
+      The <literal role="is">PARAMETERS</literal> table provides
+      information about stored function and procedure parameters, and
+      about return values for stored functions. Parameter information is
+      similar to the contents of the <literal>param_list</literal>
+      column in the <literal>mysql.proc</literal> table.
     </para>
 
     <informaltable>

@@ -5161,8 +5179,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">PARAMETERS</literal> table was added in MySQL
-          5.2.6.
+          The <literal role="is">PARAMETERS</literal> table was added in
+          MySQL 5.2.6.
         </para>
       </listitem>
 

@@ -5217,9 +5235,10 @@
     </indexterm>
 
     <para>
-      The <literal role="is">PROFILING</literal> table provides statement
-      profiling information. Its contents correspond to the information
-      produced by the <literal role="stmt">SHOW PROFILES</literal> and
+      The <literal role="is">PROFILING</literal> table provides
+      statement profiling information. Its contents correspond to the
+      information produced by the <literal role="stmt">SHOW
+      PROFILES</literal> and
       <literal role="stmt" condition="show-profiles">SHOW
       PROFILE</literal> statements (see
       <xref linkend="show-profiles"/>). The table is empty unless the

@@ -5340,8 +5359,8 @@
 
       <listitem>
         <para>
-          The <literal role="is">PROFILING</literal> table was added in MySQL
-          6.0.5.
+          The <literal role="is">PROFILING</literal> table was added in
+          MySQL 6.0.5.
         </para>
       </listitem>
 


Modified: trunk/refman-6.0/internationalization.xml
===================================================================
--- trunk/refman-6.0/internationalization.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/internationalization.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 5; 1367 bytes

@@ -3121,10 +3121,10 @@
           contain information similar to that displayed by the
           <literal>SHOW</literal> statements. For example, the
           <literal role="is">CHARACTER_SETS</literal> and
-          <literal role="is">COLLATIONS</literal> tables contain the information
-          displayed by <literal role="stmt">SHOW CHARACTER SET</literal>
-          and <literal role="stmt">SHOW COLLATION</literal>. See
-          <xref linkend="information-schema"/>.
+          <literal role="is">COLLATIONS</literal> tables contain the
+          information displayed by <literal role="stmt">SHOW CHARACTER
+          SET</literal> and <literal role="stmt">SHOW
+          COLLATION</literal>. See <xref linkend="information-schema"/>.
         </para>
 
         <para>

@@ -8197,7 +8197,8 @@
         <listitem>
           <para>
             The <literal>ID</literal> column of the
-            <literal role="is">INFORMATION_SCHEMA.COLLATIONS</literal> table
+            <literal role="is">INFORMATION_SCHEMA.COLLATIONS</literal>
+            table
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/introduction.xml
===================================================================
--- trunk/refman-6.0/introduction.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/introduction.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 1006 bytes

@@ -417,10 +417,10 @@
             <para>
               Improvements in the <literal>INFORMATION_SCHEMA</literal>
               database, with the addition of the
-              <literal role="is">INFORMATION_SCHEMA.PARAMETERS</literal> table,
-              and new columns added to
-              <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal> (see
-              <xref linkend="parameters-table"/>, and
+              <literal role="is">INFORMATION_SCHEMA.PARAMETERS</literal>
+              table, and new columns added to
+              <literal role="is">INFORMATION_SCHEMA.ROUTINES</literal>
+              (see <xref linkend="parameters-table"/>, and
               <xref linkend="routines-table"/>).
             </para>
           </listitem>


Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/optimization.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1372 bytes

@@ -6736,10 +6736,11 @@
         <literal>INFORMATION_SCHEMA</literal> tables shown in the
         following table, which shows the columns for which a constant
         lookup value enables the server to avoid a directory scan. For
-        example, if you are selecting from <literal role="is">TABLES</literal>,
-        using a constant lookup value for
-        <literal>TABLE_SCHEMA</literal> in the <literal>WHERE</literal>
-        clause enables a data directory scan to be avoided.
+        example, if you are selecting from
+        <literal role="is">TABLES</literal>, using a constant lookup
+        value for <literal>TABLE_SCHEMA</literal> in the
+        <literal>WHERE</literal> clause enables a data directory scan to
+        be avoided.
       </para>
 
       <informaltable>

@@ -6947,8 +6948,8 @@
 
         <listitem>
           <para>
-            <literal role="is">COLUMNS</literal>: <literal>OPEN_FRM_ONLY</literal>
-            applies to all columns
+            <literal role="is">COLUMNS</literal>:
+            <literal>OPEN_FRM_ONLY</literal> applies to all columns
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/partitioning.xml
===================================================================
--- trunk/refman-6.0/partitioning.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/partitioning.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 5, Lines Added: 15, Lines Deleted: 12; 3058 bytes

@@ -1700,7 +1700,8 @@
             the output of <literal role="stmt">SHOW CREATE
             TABLE</literal> or in the
             <literal>PARTITION_EXPRESSION</literal> column of the
-            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table.
+            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+            table.
           </para>
 
           <para>

@@ -2208,8 +2209,9 @@
 
           You can see the partitions created by these two
           <literal role="stmt">CREATE TABLE</literal> statements using
-          the following query against the <literal role="is">PARTITIONS</literal>
-          table in the <literal>INFORMATION_SCHEMA</literal> database:
+          the following query against the
+          <literal role="is">PARTITIONS</literal> table in the
+          <literal>INFORMATION_SCHEMA</literal> database:
 
 <programlisting>
 mysql&gt; <userinput>SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS, AVG_ROW_LENGTH, DATA_LENGTH</userinput>

@@ -2420,11 +2422,11 @@
 </programlisting>
 
           By issuing the appropriate query against
-          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>, you can
-          determine which partitions were used to store the rows just
-          inserted (we assume, as in the previous examples, that the
-          partitioned tables were created in the <literal>p</literal>
-          database):
+          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>,
+          you can determine which partitions were used to store the rows
+          just inserted (we assume, as in the previous examples, that
+          the partitioned tables were created in the
+          <literal>p</literal> database):
 
 <programlisting>
 mysql&gt; <userinput>SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS, AVG_ROW_LENGTH, DATA_LENGTH</userinput>

@@ -2523,9 +2525,9 @@
           <literal>HASH</literal> or <literal>KEY</literal>, this result
           is treated for determining the correct partition as
           <literal>0</literal>. Checking the
-          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table once
-          again, we can see that both rows were inserted into partition
-          <literal>p0</literal>:
+          <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+          table once again, we can see that both rows were inserted into
+          partition <literal>p0</literal>:
 
 <programlisting>
 mysql&gt; <userinput>SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS, AVG_ROW_LENGTH, DATA_LENGTH</userinput>

@@ -3516,7 +3518,8 @@
         <listitem>
           <para>
             Querying the
-            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal> table.
+            <literal role="is">INFORMATION_SCHEMA.PARTITIONS</literal>
+            table.
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/replication-notes.xml
===================================================================
--- trunk/refman-6.0/replication-notes.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/replication-notes.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1294 bytes

@@ -1047,8 +1047,8 @@
                     The master on which the event was created is
                     identified on the slave by its server ID. The
                     <literal>ORIGINATOR</literal> column in
-                    <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> and the
-                    <literal>originator</literal> column in
+                    <literal role="is">INFORMATION_SCHEMA.EVENTS</literal>
+                    and the <literal>originator</literal> column in
                     <literal>mysql.event</literal> store this
                     information. (See <xref linkend="events-table"/>,
                     and <xref linkend="show-events"/>.)

@@ -1082,8 +1082,8 @@
 </programlisting>
 
         Alternatively, you might wish to query the
-        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table as shown
-        here:
+        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table as
+        shown here:
 
 <programlisting>
 SELECT EVENT_SCHEMA, EVENT_NAME, ORIGINATOR


Modified: trunk/refman-6.0/restrictions.xml
===================================================================
--- trunk/refman-6.0/restrictions.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/restrictions.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 700 bytes

@@ -413,8 +413,9 @@
       <listitem>
         <para>
           The <literal>SQL_MODE</literal> column in
-          <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> shows the server
-          SQL mode that was in effect when the event was created.
+          <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> shows
+          the server SQL mode that was in effect when the event was
+          created.
         </para>
       </listitem>
 


Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/se-innodb-core.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 8; 1658 bytes

@@ -1765,14 +1765,15 @@
           <literal role="stmt">SHOW TABLE STATUS</literal> or
           <literal role="stmt">SHOW INDEX</literal>, or when accessing
           the <literal>INFORMATION_SCHEMA</literal> tables
-          <literal role="is">TABLES</literal> or <literal role="is">STATISTICS</literal>.
-          (These updates are similar to what happens for
-          <literal role="stmt">ANALYZE TABLE</literal>.) When disabled,
-          <literal>InnoDB</literal> does not updates statistics during
-          these operations. Disabling this variable can improve access
-          speed for schemas that have a large number of tables or
-          indexes. It can also improve the stability of execution plans
-          for queries that involve <literal>InnoDB</literal> tables.
+          <literal role="is">TABLES</literal> or
+          <literal role="is">STATISTICS</literal>. (These updates are
+          similar to what happens for <literal role="stmt">ANALYZE
+          TABLE</literal>.) When disabled, <literal>InnoDB</literal>
+          does not updates statistics during these operations. Disabling
+          this variable can improve access speed for schemas that have a
+          large number of tables or indexes. It can also improve the
+          stability of execution plans for queries that involve
+          <literal>InnoDB</literal> tables.
         </para>
       </listitem>
 


Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 9; 1964 bytes

@@ -5741,8 +5741,8 @@
         The columns in the output of <literal role="stmt">SHOW
         EVENTS</literal> &mdash; which are similar to, but not identical
         to the columns in the
-        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table &mdash; are
-        shown here:
+        <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table
+        &mdash; are shown here:
       </para>
 
       <itemizedlist>

@@ -6743,13 +6743,13 @@
         <literal role="stmt">SHOW PROCESSLIST</literal> shows you which
         threads are running. You can also get this information from the
         <literal>INFORMATION_SCHEMA</literal>
-        <literal role="is">PROCESSLIST</literal> table or the <command>mysqladmin
-        processlist</command> command. If you have the
-        <literal>PROCESS</literal> privilege, you can see all threads.
-        Otherwise, you can see only your own threads (that is, threads
-        associated with the MySQL account that you are using). If you do
-        not use the <literal>FULL</literal> keyword, only the first 100
-        characters of each statement are shown in the
+        <literal role="is">PROCESSLIST</literal> table or the
+        <command>mysqladmin processlist</command> command. If you have
+        the <literal>PROCESS</literal> privilege, you can see all
+        threads. Otherwise, you can see only your own threads (that is,
+        threads associated with the MySQL account that you are using).
+        If you do not use the <literal>FULL</literal> keyword, only the
+        first 100 characters of each statement are shown in the
         <literal>Info</literal> field.
       </para>
 


Modified: trunk/refman-6.0/views.xml
===================================================================
--- trunk/refman-6.0/views.xml	2008-11-04 03:18:08 UTC (rev 12271)
+++ trunk/refman-6.0/views.xml	2008-11-04 03:18:24 UTC (rev 12272)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 826 bytes

@@ -638,7 +638,8 @@
       <literal role="stmt">DELETE</literal> (and similar operations) are
       legal for the view. Otherwise, the flag is set to
       <literal>NO</literal> (false). The <literal>IS_UPDATABLE</literal>
-      column in the <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table
+      column in the
+      <literal role="is">INFORMATION_SCHEMA.VIEWS</literal> table
       displays the status of this flag. It means that the server always
       knows whether a view is updatable. If the view is not updatable,
       statements such <literal role="stmt">UPDATE</literal>,


Thread
svn commit - mysqldoc@docsrva: r12272 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0paul.dubois4 Nov