List:Commits« Previous MessageNext Message »
From:paul.dubois Date:April 26 2011 4:39pm
Subject:svn commit - mysqldoc@oter02: r26018 - in trunk: . refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: pd221994
Date: 2011-04-26 18:39:14 +0200 (Tue, 26 Apr 2011)
New Revision: 26018

Log:
 r47411@dhcp-adc-twvpn-1-vpnpool-10-154-14-116:  paul | 2011-04-26 11:37:08 -0500
 Revise titles, reformat


Modified:
   svk:merge
   trunk/refman-5.5/performance-schema-core.xml
   trunk/refman-5.6/performance-schema-core.xml
   trunk/refman-6.0/performance-schema-core.xml

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes


Modified: trunk/refman-5.5/performance-schema-core.xml
===================================================================
--- trunk/refman-5.5/performance-schema-core.xml	2011-04-26 16:39:06 UTC (rev 26017)
+++ trunk/refman-5.5/performance-schema-core.xml	2011-04-26 16:39:14 UTC (rev 26018)
Changed blocks: 5, Lines Added: 14, Lines Deleted: 16; 2151 bytes

@@ -3798,9 +3798,9 @@
         in different ways.
       </para>
 
-<para>
-General Event Wait Summaries:
-</para>
+      <para>
+        General Event Wait Summaries:
+      </para>
 
       <itemizedlist>
 

@@ -3824,14 +3824,15 @@
             Events summarized per event name
           </para>
         </listitem>
+
       </itemizedlist>
 
+      <para>
+        File I/O Summaries:
+      </para>
 
-
-<para>
-File I/O Summaries:
-</para>
       <itemizedlist>
+
         <listitem>
           <para>
             <literal role="ps">file_summary_by_event_name</literal>:

@@ -3857,10 +3858,10 @@
 
       <para>
         Each summary table has grouping columns that are used to group
-        the data to be aggregated, and summary columns that contain
-        the aggregated values. Tables that summarize events in similar
-        ways often have similar sets of summary columns and differ only
-        in the grouping columns used to determine how events are
+        the data to be aggregated, and summary columns that contain the
+        aggregated values. Tables that summarize events in similar ways
+        often have similar sets of summary columns and differ only in
+        the grouping columns used to determine how events are
         aggregated.
       </para>
 

@@ -3875,9 +3876,7 @@
 
       <section id="events-waits-summary-by-xxx-tables">
 
-        <title>The
-          <literal>events_waits_summary_by_<replaceable>xxx</replaceable></literal>
-          Tables</title>
+        <title>Event Wait Summary Tables</title>
 
         <indexterm>
           <primary>performance_schema</primary>

@@ -4051,8 +4050,7 @@
 
       <section id="file-summary-by-xxx-tables">
 
-        <title>The <literal>file_summary_by_<replaceable>xxx</replaceable></literal>
-          Tables</title>
+        <title>File I/O Summary Tables</title>
 
         <indexterm>
           <primary>performance_schema</primary>


Modified: trunk/refman-5.6/performance-schema-core.xml
===================================================================
--- trunk/refman-5.6/performance-schema-core.xml	2011-04-26 16:39:06 UTC (rev 26017)
+++ trunk/refman-5.6/performance-schema-core.xml	2011-04-26 16:39:14 UTC (rev 26018)
Changed blocks: 11, Lines Added: 520, Lines Deleted: 511; 45316 bytes

@@ -5459,9 +5459,9 @@
         in different ways.
       </para>
 
-<para>
-General Event Wait Summaries:
-</para>
+      <para>
+        General Event Wait Summaries:
+      </para>
 
       <itemizedlist>
 

@@ -5485,27 +5485,30 @@
             Events summarized per event name
           </para>
         </listitem>
+
       </itemizedlist>
 
+      <para>
+        Object Wait Summaries:
+      </para>
 
-<para>
-Object Wait Summaries:
-</para>
       <itemizedlist>
+
         <listitem>
           <para>
             <literal role="ps">objects_summary_global_by_type</literal>:
             Object summaries
           </para>
         </listitem>
+
       </itemizedlist>
 
+      <para>
+        File I/O Summaries:
+      </para>
 
+      <itemizedlist>
 
-<para>
-File I/O Summaries:
-</para>
-      <itemizedlist>
         <listitem>
           <para>
             <literal role="ps">file_summary_by_event_name</literal>:

@@ -5519,12 +5522,15 @@
             events summarized per instance
           </para>
         </listitem>
+
       </itemizedlist>
-<para>
-Table I/O and Lock Wait Summaries:
-</para>
 
+      <para>
+        Table I/O and Lock Wait Summaries:
+      </para>
+
       <itemizedlist>
+
         <listitem>
           <para>
             <literal role="ps">table_io_waits_summary_by_index_usage</literal>:

@@ -5550,10 +5556,10 @@
 
       <para>
         Each summary table has grouping columns that are used to group
-        the data to be aggregated, and summary columns that contain
-        the aggregated values. Tables that summarize events in similar
-        ways often have similar sets of summary columns and differ only
-        in the grouping columns used to determine how events are
+        the data to be aggregated, and summary columns that contain the
+        aggregated values. Tables that summarize events in similar ways
+        often have similar sets of summary columns and differ only in
+        the grouping columns used to determine how events are
         aggregated.
       </para>
 

@@ -5568,9 +5574,7 @@
 
       <section id="events-waits-summary-by-xxx-tables">
 
-        <title>The
-          <literal>events_waits_summary_by_<replaceable>xxx</replaceable></literal>
-          Tables</title>
+        <title>Event Wait Summary Tables</title>
 
         <indexterm>
           <primary>performance_schema</primary>

@@ -5677,8 +5681,7 @@
 
         <para>
           <literal>events_waits_summary_by_<replaceable>xxx</replaceable></literal>
-          tables
-          have these summary columns in common:
+          tables have these summary columns in common:
         </para>
 
         <itemizedlist>

@@ -5745,9 +5748,7 @@
 
       <section id="objects-summary-global-by-type-table">
 
-        <title>The
-          <literal role="ps">objects_summary_global_by_type</literal>
-          Table</title>
+        <title>Object Wait Summary Table</title>
 
         <indexterm>
           <primary>performance_schema</primary>

@@ -5762,8 +5763,7 @@
         <para>
           The
           <literal role="ps">objects_summary_global_by_type</literal>
-aggregates object wait events.
-          For example:
+          aggregates object wait events. For example:
         </para>
 
 <programlisting>

@@ -5791,31 +5791,28 @@
 ...
 </programlisting>
 
-            <para>
-The
-              <literal role="ps">objects_summary_global_by_type</literal>
-grouping columns are
-              <literal>OBJECT_TYPE</literal>,
-              <literal>OBJECT_SCHEMA</literal>, and
-              <literal>OBJECT_NAME</literal> columns. Each row
-              summarizes events for the given object.
-            </para>
+        <para>
+          The
+          <literal role="ps">objects_summary_global_by_type</literal>
+          grouping columns are <literal>OBJECT_TYPE</literal>,
+          <literal>OBJECT_SCHEMA</literal>, and
+          <literal>OBJECT_NAME</literal> columns. Each row summarizes
+          events for the given object.
+        </para>
 
         <para>
           <literal role="ps">objects_summary_global_by_type</literal>
-has the same summary columns as the
+          has the same summary columns as the
           <literal>events_waits_summary_by_<replaceable>xxx</replaceable></literal>
-          tables.
-See
-      <xref linkend="events-waits-summary-by-xxx-tables"/>.
+          tables. See
+          <xref linkend="events-waits-summary-by-xxx-tables"/>.
         </para>
 
       </section>
 
       <section id="file-summary-by-xxx-tables">
 
-        <title>The <literal>file_summary_by_<replaceable>xxx</replaceable></literal>
-          Tables</title>
+        <title>File I/O Summary Tables</title>
 
         <indexterm>
           <primary>performance_schema</primary>

@@ -5915,301 +5912,309 @@
 
       </section>
 
-      <section id="table-io-waits-summary-by-table-table">
+      <section id="table-waits-summary-tables">
 
-        <title>The <literal role="ps">table_io_waits_summary_by_table</literal> Table</title>
+        <title>Table I/O and Lock Wait Summary Tables</title>
 
-        <indexterm>
-          <primary>performance_schema</primary>
-          <secondary>table_io_waits_summary_by_table table</secondary>
-        </indexterm>
+        <section id="table-io-waits-summary-by-table-table">
 
-        <indexterm>
-          <primary>table_io_waits_summary_by_table table</primary>
-          <secondary>performance_schema</secondary>
-        </indexterm>
+          <title>The <literal role="ps">table_io_waits_summary_by_table</literal> Table</title>
 
-        <para>
-          The
-          <literal role="ps">table_io_waits_summary_by_table</literal>
-          table aggregates all table I/O wait events, as generated by
-          the <literal>wait/io/table/sql/handler</literal> instrument.
-          The grouping is by table, as identified by the
-          <literal>OBJECT_TYPE</literal>,
-          <literal>OBJECT_SCHEMA</literal>, and
-          <literal>OBJECT_NAME</literal> columns.
-        </para>
+          <indexterm>
+            <primary>performance_schema</primary>
+            <secondary>table_io_waits_summary_by_table table</secondary>
+          </indexterm>
 
-        <para>
-          <literal role="stmt">TRUNCATE TABLE</literal> is permitted for
-          this table. It resets the counters to zero rather than
-          removing rows. Truncating this table also truncates the
-          <literal role="ps">table_io_waits_summary_by_index_usage</literal>
-          table.
-        </para>
+          <indexterm>
+            <primary>table_io_waits_summary_by_table table</primary>
+            <secondary>performance_schema</secondary>
+          </indexterm>
 
-        <para>
-          As indicated in the column descriptions, some columns are more
-          general and have values that are the same as the sum of the
-          values of more fine-grained columns.For example, columns that
-          aggregate all writes hold the sum of the corresponding columns
-          that aggregate inserts, updates, and deletes. In this way,
-          aggregations at higher levels are available directly without
-          the need for user-defined views that sum lower-level columns.
-        </para>
+          <para>
+            The
+            <literal role="ps">table_io_waits_summary_by_table</literal>
+            table aggregates all table I/O wait events, as generated by
+            the <literal>wait/io/table/sql/handler</literal> instrument.
+            The grouping is by table, as identified by the
+            <literal>OBJECT_TYPE</literal>,
+            <literal>OBJECT_SCHEMA</literal>, and
+            <literal>OBJECT_NAME</literal> columns.
+          </para>
 
-        <itemizedlist>
+          <para>
+            <literal role="stmt">TRUNCATE TABLE</literal> is permitted
+            for this table. It resets the counters to zero rather than
+            removing rows. Truncating this table also truncates the
+            <literal role="ps">table_io_waits_summary_by_index_usage</literal>
+            table.
+          </para>
 
-          <listitem>
-            <para>
-              <literal>OBJECT_TYPE</literal>,
-              <literal>OBJECT_SCHEMA</literal>,
-              <literal>OBJECT_NAME</literal>
-            </para>
+          <para>
+            As indicated in the column descriptions, some columns are
+            more general and have values that are the same as the sum of
+            the values of more fine-grained columns.For example, columns
+            that aggregate all writes hold the sum of the corresponding
+            columns that aggregate inserts, updates, and deletes. In
+            this way, aggregations at higher levels are available
+            directly without the need for user-defined views that sum
+            lower-level columns.
+          </para>
 
-            <para>
-              These columns have the same meaning as in the
-              <literal role="ps">events_waits_current</literal> table.
-              They identify the table to which the row applies.
-            </para>
-          </listitem>
+          <itemizedlist>
 
-          <listitem>
-            <para>
-              <literal>COUNT_STAR</literal>,
-              <literal>SUM_TIMER_WAIT</literal>,
-              <literal>MIN_TIMER_WAIT</literal>,
-              <literal>AVG_TIMER_WAIT</literal>,
-              <literal>MAX_TIMER_WAIT</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>OBJECT_TYPE</literal>,
+                <literal>OBJECT_SCHEMA</literal>,
+                <literal>OBJECT_NAME</literal>
+              </para>
 
-            <para>
-              These columns aggregate all I/O operations. They are the
-              same as the sum of the corresponding
-              <literal><replaceable>xxx</replaceable>_READ</literal> and
-              <literal><replaceable>xxx</replaceable>_WRITE</literal>
-              columns.
-            </para>
-          </listitem>
+              <para>
+                These columns have the same meaning as in the
+                <literal role="ps">events_waits_current</literal> table.
+                They identify the table to which the row applies.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_READ</literal>,
-              <literal>SUM_TIMER_READ</literal>,
-              <literal>MIN_TIMER_READ</literal>,
-              <literal>AVG_TIMER_READ</literal>,
-              <literal>MAX_TIMER_READ</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_STAR</literal>,
+                <literal>SUM_TIMER_WAIT</literal>,
+                <literal>MIN_TIMER_WAIT</literal>,
+                <literal>AVG_TIMER_WAIT</literal>,
+                <literal>MAX_TIMER_WAIT</literal>
+              </para>
 
-            <para>
-              These columns aggregate all read operations. They are the
-              same as the sum of the corresponding
-              <literal><replaceable>xxx</replaceable>_FETCH</literal>
-              columns.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all I/O operations. They are the
+                same as the sum of the corresponding
+                <literal><replaceable>xxx</replaceable>_READ</literal>
+                and
+                <literal><replaceable>xxx</replaceable>_WRITE</literal>
+                columns.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_WRITE</literal>,
-              <literal>SUM_TIMER_WRITE</literal>,
-              <literal>MIN_TIMER_WRITE</literal>,
-              <literal>AVG_TIMER_WRITE</literal>,
-              <literal>MAX_TIMER_WRITE</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_READ</literal>,
+                <literal>SUM_TIMER_READ</literal>,
+                <literal>MIN_TIMER_READ</literal>,
+                <literal>AVG_TIMER_READ</literal>,
+                <literal>MAX_TIMER_READ</literal>
+              </para>
 
-            <para>
-              These columns aggregate all write operations. They are the
-              same as the sum of the corresponding
-              <literal><replaceable>xxx</replaceable>_INSERT</literal>,
-              <literal><replaceable>xxx</replaceable>_UPDATE</literal>,
-              and
-              <literal><replaceable>xxx</replaceable>_DELETE</literal>
-              columns.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all read operations. They are
+                the same as the sum of the corresponding
+                <literal><replaceable>xxx</replaceable>_FETCH</literal>
+                columns.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_FETCH</literal>,
-              <literal>SUM_TIMER_FETCH</literal>,
-              <literal>MIN_TIMER_FETCH</literal>,
-              <literal>AVG_TIMER_FETCH</literal>,
-              <literal>MAX_TIMER_FETCH</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_WRITE</literal>,
+                <literal>SUM_TIMER_WRITE</literal>,
+                <literal>MIN_TIMER_WRITE</literal>,
+                <literal>AVG_TIMER_WRITE</literal>,
+                <literal>MAX_TIMER_WRITE</literal>
+              </para>
 
-            <para>
-              These columns aggregate all fetch operations.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all write operations. They are
+                the same as the sum of the corresponding
+                <literal><replaceable>xxx</replaceable>_INSERT</literal>,
+                <literal><replaceable>xxx</replaceable>_UPDATE</literal>,
+                and
+                <literal><replaceable>xxx</replaceable>_DELETE</literal>
+                columns.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_INSERT</literal>,
-              <literal>SUM_TIMER_INSERT</literal>,
-              <literal>MIN_TIMER_INSERT</literal>,
-              <literal>AVG_TIMER_INSERT</literal>,
-              <literal>MAX_TIMER_INSERT</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_FETCH</literal>,
+                <literal>SUM_TIMER_FETCH</literal>,
+                <literal>MIN_TIMER_FETCH</literal>,
+                <literal>AVG_TIMER_FETCH</literal>,
+                <literal>MAX_TIMER_FETCH</literal>
+              </para>
 
-            <para>
-              These columns aggregate all insert operations.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all fetch operations.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_UPDATE</literal>,
-              <literal>SUM_TIMER_UPDATE</literal>,
-              <literal>MIN_TIMER_UPDATE</literal>,
-              <literal>AVG_TIMER_UPDATE</literal>,
-              <literal>MAX_TIMER_UPDATE</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_INSERT</literal>,
+                <literal>SUM_TIMER_INSERT</literal>,
+                <literal>MIN_TIMER_INSERT</literal>,
+                <literal>AVG_TIMER_INSERT</literal>,
+                <literal>MAX_TIMER_INSERT</literal>
+              </para>
 
-            <para>
-              These columns aggregate all update operations.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all insert operations.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_DELETE</literal>,
-              <literal>SUM_TIMER_DELETE</literal>,
-              <literal>MIN_TIMER_DELETE</literal>,
-              <literal>AVG_TIMER_DELETE</literal>,
-              <literal>MAX_TIMER_DELETE</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_UPDATE</literal>,
+                <literal>SUM_TIMER_UPDATE</literal>,
+                <literal>MIN_TIMER_UPDATE</literal>,
+                <literal>AVG_TIMER_UPDATE</literal>,
+                <literal>MAX_TIMER_UPDATE</literal>
+              </para>
 
-            <para>
-              These columns aggregate all delete operations.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all update operations.
+              </para>
+            </listitem>
 
-        </itemizedlist>
+            <listitem>
+              <para>
+                <literal>COUNT_DELETE</literal>,
+                <literal>SUM_TIMER_DELETE</literal>,
+                <literal>MIN_TIMER_DELETE</literal>,
+                <literal>AVG_TIMER_DELETE</literal>,
+                <literal>MAX_TIMER_DELETE</literal>
+              </para>
 
-      </section>
+              <para>
+                These columns aggregate all delete operations.
+              </para>
+            </listitem>
 
-      <section id="table-io-waits-summary-by-index-usage-table">
+          </itemizedlist>
 
-        <title>The <literal role="ps">table_io_waits_summary_by_index_usage</literal>
-          Table</title>
+        </section>
 
-        <indexterm>
-          <primary>performance_schema</primary>
-          <secondary>table_io_waits_summary_by_index_usage table</secondary>
-        </indexterm>
+        <section id="table-io-waits-summary-by-index-usage-table">
 
-        <indexterm>
-          <primary>table_io_waits_summary_by_index_usage table</primary>
-          <secondary>performance_schema</secondary>
-        </indexterm>
+          <title>The <literal role="ps">table_io_waits_summary_by_index_usage</literal>
+            Table</title>
 
-        <para>
-          The
-          <literal role="ps">table_io_waits_summary_by_index_usage</literal>
-          table aggregates all table index I/O wait events, as generated
-          by the <literal>wait/io/table/sql/handler</literal>
-          instrument. The grouping is by table index, as identified by
-          the <literal>OBJECT_TYPE</literal>,
-          <literal>OBJECT_SCHEMA</literal>,
-          <literal>OBJECT_NAME</literal>, and
-          <literal>INDEX_NAME</literal> columns.
-        </para>
+          <indexterm>
+            <primary>performance_schema</primary>
+            <secondary>table_io_waits_summary_by_index_usage table</secondary>
+          </indexterm>
 
-        <para>
-          <literal role="stmt">TRUNCATE TABLE</literal> is permitted for
-          this table. It resets the counters to zero rather than
-          removing rows. This table is also truncated by truncation of
-          the
-          <literal role="ps">table_io_waits_summary_by_table</literal>
-          table. A DDL operation that changes the index structure of a
-          table may cause the per-index statistics to be reset.
-        </para>
+          <indexterm>
+            <primary>table_io_waits_summary_by_index_usage table</primary>
+            <secondary>performance_schema</secondary>
+          </indexterm>
 
-        <para>
-          The structure of
-          <literal role="ps">table_io_waits_summary_by_index_usage</literal>
-          is nearly identical to
-          <literal role="ps">table_io_waits_summary_by_table</literal>.
-          The only additional column is <literal>INDEX_NAME</literal>,
-          which corresponds to the name of the index that was used when
-          the table I/O wait event was recorded.
-        </para>
+          <para>
+            The
+            <literal role="ps">table_io_waits_summary_by_index_usage</literal>
+            table aggregates all table index I/O wait events, as
+            generated by the
+            <literal>wait/io/table/sql/handler</literal> instrument. The
+            grouping is by table index, as identified by the
+            <literal>OBJECT_TYPE</literal>,
+            <literal>OBJECT_SCHEMA</literal>,
+            <literal>OBJECT_NAME</literal>, and
+            <literal>INDEX_NAME</literal> columns.
+          </para>
 
-        <itemizedlist>
+          <para>
+            <literal role="stmt">TRUNCATE TABLE</literal> is permitted
+            for this table. It resets the counters to zero rather than
+            removing rows. This table is also truncated by truncation of
+            the
+            <literal role="ps">table_io_waits_summary_by_table</literal>
+            table. A DDL operation that changes the index structure of a
+            table may cause the per-index statistics to be reset.
+          </para>
 
-          <listitem>
-            <para>
-              A value of <literal>PRIMARY</literal> indicates that table
-              I/O used the primary index.
-            </para>
-          </listitem>
+          <para>
+            The structure of
+            <literal role="ps">table_io_waits_summary_by_index_usage</literal>
+            is nearly identical to
+            <literal role="ps">table_io_waits_summary_by_table</literal>.
+            The only additional column is <literal>INDEX_NAME</literal>,
+            which corresponds to the name of the index that was used
+            when the table I/O wait event was recorded.
+          </para>
 
-          <listitem>
-            <para>
-              A value of <literal>NULL</literal> means that table I/O
-              used no index.
-            </para>
-          </listitem>
+          <itemizedlist>
 
-          <listitem>
-            <para>
-              Inserts are counted against <literal>INDEX_NAME =
-              NULL</literal>.
-            </para>
-          </listitem>
+            <listitem>
+              <para>
+                A value of <literal>PRIMARY</literal> indicates that
+                table I/O used the primary index.
+              </para>
+            </listitem>
 
-        </itemizedlist>
+            <listitem>
+              <para>
+                A value of <literal>NULL</literal> means that table I/O
+                used no index.
+              </para>
+            </listitem>
 
-      </section>
+            <listitem>
+              <para>
+                Inserts are counted against <literal>INDEX_NAME =
+                NULL</literal>.
+              </para>
+            </listitem>
 
-      <section id="table-lock-waits-summary-by-table-table">
+          </itemizedlist>
 
-        <title>The <literal role="ps">table_lock_waits_summary_by_table</literal> Table</title>
+        </section>
 
-        <indexterm>
-          <primary>performance_schema</primary>
-          <secondary>table_lock_waits_summary_by_table table</secondary>
-        </indexterm>
+        <section id="table-lock-waits-summary-by-table-table">
 
-        <indexterm>
-          <primary>table_lock_waits_summary_by_table table</primary>
-          <secondary>performance_schema</secondary>
-        </indexterm>
+          <title>The <literal role="ps">table_lock_waits_summary_by_table</literal> Table</title>
 
-        <para>
-          The
-          <literal role="ps">table_lock_waits_summary_by_table</literal>
-          table aggregates all table lock wait events, as generated by
-          the <literal>wait/lock/table/sql/handler</literal> instrument.
-          The grouping is by table, as identified by the
-          <literal>OBJECT_TYPE</literal>,
-          <literal>OBJECT_SCHEMA</literal>, and
-          <literal>OBJECT_NAME</literal> columns.
-        </para>
+          <indexterm>
+            <primary>performance_schema</primary>
+            <secondary>table_lock_waits_summary_by_table table</secondary>
+          </indexterm>
 
-        <para>
-          <literal role="stmt">TRUNCATE TABLE</literal> is permitted for
-          this table. It resets the counters to zero rather than
-          removing rows.
-        </para>
+          <indexterm>
+            <primary>table_lock_waits_summary_by_table table</primary>
+            <secondary>performance_schema</secondary>
+          </indexterm>
 
-        <para>
-          Ths table contains information about internal and external
-          locks:
-        </para>
+          <para>
+            The
+            <literal role="ps">table_lock_waits_summary_by_table</literal>
+            table aggregates all table lock wait events, as generated by
+            the <literal>wait/lock/table/sql/handler</literal>
+            instrument. The grouping is by table, as identified by the
+            <literal>OBJECT_TYPE</literal>,
+            <literal>OBJECT_SCHEMA</literal>, and
+            <literal>OBJECT_NAME</literal> columns.
+          </para>
 
-        <itemizedlist>
+          <para>
+            <literal role="stmt">TRUNCATE TABLE</literal> is permitted
+            for this table. It resets the counters to zero rather than
+            removing rows.
+          </para>
 
-          <listitem>
-            <para>
-              An internal lock corresponds to a lock in the SQL layer.
-              This is currently implemented by a call to
-              <literal>thr_lock()</literal>. In event rows, these locks
-              are distinguished by the <literal>OPERATION</literal>
-              column, which will have one of these values:
-            </para>
+          <para>
+            Ths table contains information about internal and external
+            locks:
+          </para>
 
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                An internal lock corresponds to a lock in the SQL layer.
+                This is currently implemented by a call to
+                <literal>thr_lock()</literal>. In event rows, these
+                locks are distinguished by the
+                <literal>OPERATION</literal> column, which will have one
+                of these values:
+              </para>
+
 <programlisting>
 read normal
 read with shared locks

@@ -6221,269 +6226,273 @@
 write low priority
 write normal
 </programlisting>
-          </listitem>
+            </listitem>
 
-          <listitem>
-            <para>
-              An external lock corresponds to a lock in the storage
-              engine layer. This is currently implemented by a call to
-              <literal>handler::external_lock()</literal>. In event
-              rows, these locks are distinguished by the
-              <literal>OPERATION</literal> column, which will have one
-              of these values:
-            </para>
+            <listitem>
+              <para>
+                An external lock corresponds to a lock in the storage
+                engine layer. This is currently implemented by a call to
+                <literal>handler::external_lock()</literal>. In event
+                rows, these locks are distinguished by the
+                <literal>OPERATION</literal> column, which will have one
+                of these values:
+              </para>
 
 <programlisting>
 read external
 write external
 </programlisting>
-          </listitem>
+            </listitem>
 
-        </itemizedlist>
+          </itemizedlist>
 
-        <para>
-          As indicated in the column descriptions, some columns are more
-          general and have values that are the same as the sum of the
-          values of more fine-grained columns.For example, columns that
-          aggregate all writes hold the sum of the corresponding columns
-          that aggregate inserts, updates, and deletes. In this way,
-          aggregations at higher levels are available directly without
-          the need for user-defined views that sum lower-level columns.
-        </para>
+          <para>
+            As indicated in the column descriptions, some columns are
+            more general and have values that are the same as the sum of
+            the values of more fine-grained columns.For example, columns
+            that aggregate all writes hold the sum of the corresponding
+            columns that aggregate inserts, updates, and deletes. In
+            this way, aggregations at higher levels are available
+            directly without the need for user-defined views that sum
+            lower-level columns.
+          </para>
 
-        <itemizedlist>
+          <itemizedlist>
 
-          <listitem>
-            <para>
-              <literal>OBJECT_TYPE</literal>,
-              <literal>OBJECT_SCHEMA</literal>,
-              <literal>OBJECT_NAME</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>OBJECT_TYPE</literal>,
+                <literal>OBJECT_SCHEMA</literal>,
+                <literal>OBJECT_NAME</literal>
+              </para>
 
-            <para>
-              These columns have the same meaning as in the
-              <literal role="ps">events_waits_current</literal> table.
-              They identify the table to which the row applies.
-            </para>
-          </listitem>
+              <para>
+                These columns have the same meaning as in the
+                <literal role="ps">events_waits_current</literal> table.
+                They identify the table to which the row applies.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_STAR</literal>,
-              <literal>SUM_TIMER_WAIT</literal>,
-              <literal>MIN_TIMER_WAIT</literal>,
-              <literal>AVG_TIMER_WAIT</literal>,
-              <literal>MAX_TIMER_WAIT</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_STAR</literal>,
+                <literal>SUM_TIMER_WAIT</literal>,
+                <literal>MIN_TIMER_WAIT</literal>,
+                <literal>AVG_TIMER_WAIT</literal>,
+                <literal>MAX_TIMER_WAIT</literal>
+              </para>
 
-            <para>
-              These columns aggregate all lock operations. They are the
-              same as the sum of the corresponding
-              <literal><replaceable>xxx</replaceable>_READ</literal> and
-              <literal><replaceable>xxx</replaceable>_WRITE</literal>
-              columns.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all lock operations. They are
+                the same as the sum of the corresponding
+                <literal><replaceable>xxx</replaceable>_READ</literal>
+                and
+                <literal><replaceable>xxx</replaceable>_WRITE</literal>
+                columns.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_READ</literal>,
-              <literal>SUM_TIMER_READ</literal>,
-              <literal>MIN_TIMER_READ</literal>,
-              <literal>AVG_TIMER_READ</literal>,
-              <literal>MAX_TIMER_READ</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_READ</literal>,
+                <literal>SUM_TIMER_READ</literal>,
+                <literal>MIN_TIMER_READ</literal>,
+                <literal>AVG_TIMER_READ</literal>,
+                <literal>MAX_TIMER_READ</literal>
+              </para>
 
-            <para>
-              These columns aggregate all read-lock operations. They are
-              the same as the sum of the corresponding
-              <literal><replaceable>xxx</replaceable>_READ_NORMAL</literal>,
-              <literal><replaceable>xxx</replaceable>_READ_WITH_SHARED_LOCKS</literal>,
-              <literal><replaceable>xxx</replaceable>_READ_HIGH_PRIORITY</literal>,
-              and
-              <literal><replaceable>xxx</replaceable>_READ_NO_INSERT</literal>
-              columns.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all read-lock operations. They
+                are the same as the sum of the corresponding
+                <literal><replaceable>xxx</replaceable>_READ_NORMAL</literal>,
+                <literal><replaceable>xxx</replaceable>_READ_WITH_SHARED_LOCKS</literal>,
+                <literal><replaceable>xxx</replaceable>_READ_HIGH_PRIORITY</literal>,
+                and
+                <literal><replaceable>xxx</replaceable>_READ_NO_INSERT</literal>
+                columns.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_WRITE</literal>,
-              <literal>SUM_TIMER_WRITE</literal>,
-              <literal>MIN_TIMER_WRITE</literal>,
-              <literal>AVG_TIMER_WRITE</literal>,
-              <literal>MAX_TIMER_WRITE</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_WRITE</literal>,
+                <literal>SUM_TIMER_WRITE</literal>,
+                <literal>MIN_TIMER_WRITE</literal>,
+                <literal>AVG_TIMER_WRITE</literal>,
+                <literal>MAX_TIMER_WRITE</literal>
+              </para>
 
-            <para>
-              These columns aggregate all write-lock operations. They
-              are the same as the sum of the corresponding
-              <literal><replaceable>xxx</replaceable>_WRITE_ALLOW_WRITE</literal>,
-              <literal><replaceable>xxx</replaceable>_WRITE_CONCURRENT_INSERT</literal>,
-              <literal><replaceable>xxx</replaceable>_WRITE_DELAYED</literal>,
-              <literal><replaceable>xxx</replaceable>_WRITE_LOW_PRIORITY</literal>,
-              and
-              <literal><replaceable>xxx</replaceable>_WRITE_NORMAL</literal>
-              columns.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate all write-lock operations. They
+                are the same as the sum of the corresponding
+                <literal><replaceable>xxx</replaceable>_WRITE_ALLOW_WRITE</literal>,
+                <literal><replaceable>xxx</replaceable>_WRITE_CONCURRENT_INSERT</literal>,
+                <literal><replaceable>xxx</replaceable>_WRITE_DELAYED</literal>,
+                <literal><replaceable>xxx</replaceable>_WRITE_LOW_PRIORITY</literal>,
+                and
+                <literal><replaceable>xxx</replaceable>_WRITE_NORMAL</literal>
+                columns.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_READ_NORMAL</literal>,
-              <literal>SUM_TIMER_READ_NORMAL</literal>,
-              <literal>MIN_TIMER_READ_NORMAL</literal>,
-              <literal>AVG_TIMER_READ_NORMAL</literal>,
-              <literal>MAX_TIMER_READ_NORMAL</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_READ_NORMAL</literal>,
+                <literal>SUM_TIMER_READ_NORMAL</literal>,
+                <literal>MIN_TIMER_READ_NORMAL</literal>,
+                <literal>AVG_TIMER_READ_NORMAL</literal>,
+                <literal>MAX_TIMER_READ_NORMAL</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal read locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal read locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_READ_WITH_SHARED_LOCKS</literal>,
-              <literal>SUM_TIMER_READ_WITH_SHARED_LOCKS</literal>,
-              <literal>MIN_TIMER_READ_WITH_SHARED_LOCKS</literal>,
-              <literal>AVG_TIMER_READ_WITH_SHARED_LOCKS</literal>,
-              <literal>MAX_TIMER_READ_WITH_SHARED_LOCKS</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_READ_WITH_SHARED_LOCKS</literal>,
+                <literal>SUM_TIMER_READ_WITH_SHARED_LOCKS</literal>,
+                <literal>MIN_TIMER_READ_WITH_SHARED_LOCKS</literal>,
+                <literal>AVG_TIMER_READ_WITH_SHARED_LOCKS</literal>,
+                <literal>MAX_TIMER_READ_WITH_SHARED_LOCKS</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal read locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal read locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_READ_HIGH_PRIORITY</literal>,
-              <literal>SUM_TIMER_READ_HIGH_PRIORITY</literal>,
-              <literal>MIN_TIMER_READ_HIGH_PRIORITY</literal>,
-              <literal>AVG_TIMER_READ_HIGH_PRIORITY</literal>,
-              <literal>MAX_TIMER_READ_HIGH_PRIORITY</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_READ_HIGH_PRIORITY</literal>,
+                <literal>SUM_TIMER_READ_HIGH_PRIORITY</literal>,
+                <literal>MIN_TIMER_READ_HIGH_PRIORITY</literal>,
+                <literal>AVG_TIMER_READ_HIGH_PRIORITY</literal>,
+                <literal>MAX_TIMER_READ_HIGH_PRIORITY</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal read locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal read locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_READ_NO_INSERT</literal>,
-              <literal>SUM_TIMER_READ_NO_INSERT</literal>,
-              <literal>MIN_TIMER_READ_NO_INSERT</literal>,
-              <literal>AVG_TIMER_READ_NO_INSERT</literal>,
-              <literal>MAX_TIMER_READ_NO_INSERT</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_READ_NO_INSERT</literal>,
+                <literal>SUM_TIMER_READ_NO_INSERT</literal>,
+                <literal>MIN_TIMER_READ_NO_INSERT</literal>,
+                <literal>AVG_TIMER_READ_NO_INSERT</literal>,
+                <literal>MAX_TIMER_READ_NO_INSERT</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal read locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal read locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_READ_EXTERNAL</literal>,
-              <literal>SUM_TIMER_READ_EXTERNAL</literal>,
-              <literal>MIN_TIMER_READ_EXTERNAL</literal>,
-              <literal>AVG_TIMER_READ_EXTERNAL</literal>,
-              <literal>MAX_TIMER_READ_EXTERNAL</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_READ_EXTERNAL</literal>,
+                <literal>SUM_TIMER_READ_EXTERNAL</literal>,
+                <literal>MIN_TIMER_READ_EXTERNAL</literal>,
+                <literal>AVG_TIMER_READ_EXTERNAL</literal>,
+                <literal>MAX_TIMER_READ_EXTERNAL</literal>
+              </para>
 
-            <para>
-              These columns aggregate external read locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate external read locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_WRITE_ALLOW_WRITE</literal>,
-              <literal>SUM_TIMER_WRITE_ALLOW_WRITE</literal>,
-              <literal>MIN_TIMER_WRITE_ALLOW_WRITE</literal>,
-              <literal>AVG_TIMER_WRITE_ALLOW_WRITE</literal>,
-              <literal>MAX_TIMER_WRITE_ALLOW_WRITE</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_WRITE_ALLOW_WRITE</literal>,
+                <literal>SUM_TIMER_WRITE_ALLOW_WRITE</literal>,
+                <literal>MIN_TIMER_WRITE_ALLOW_WRITE</literal>,
+                <literal>AVG_TIMER_WRITE_ALLOW_WRITE</literal>,
+                <literal>MAX_TIMER_WRITE_ALLOW_WRITE</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal write locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal write locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_WRITE_CONCURRENT_INSERT</literal>,
-              <literal>SUM_TIMER_WRITE_CONCURRENT_INSERT</literal>,
-              <literal>MIN_TIMER_WRITE_CONCURRENT_INSERT</literal>,
-              <literal>AVG_TIMER_WRITE_CONCURRENT_INSERT</literal>,
-              <literal>MAX_TIMER_WRITE_CONCURRENT_INSERT</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_WRITE_CONCURRENT_INSERT</literal>,
+                <literal>SUM_TIMER_WRITE_CONCURRENT_INSERT</literal>,
+                <literal>MIN_TIMER_WRITE_CONCURRENT_INSERT</literal>,
+                <literal>AVG_TIMER_WRITE_CONCURRENT_INSERT</literal>,
+                <literal>MAX_TIMER_WRITE_CONCURRENT_INSERT</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal write locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal write locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_WRITE_DELAYED</literal>,
-              <literal>SUM_TIMER_WRITE_DELAYED</literal>,
-              <literal>MIN_TIMER_WRITE_DELAYED</literal>,
-              <literal>AVG_TIMER_WRITE_DELAYED</literal>,
-              <literal>MAX_TIMER_WRITE_DELAYED</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_WRITE_DELAYED</literal>,
+                <literal>SUM_TIMER_WRITE_DELAYED</literal>,
+                <literal>MIN_TIMER_WRITE_DELAYED</literal>,
+                <literal>AVG_TIMER_WRITE_DELAYED</literal>,
+                <literal>MAX_TIMER_WRITE_DELAYED</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal write locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal write locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_WRITE_LOW_PRIORITY</literal>,
-              <literal>SUM_TIMER_WRITE_LOW_PRIORITY</literal>,
-              <literal>MIN_TIMER_WRITE_LOW_PRIORITY</literal>,
-              <literal>AVG_TIMER_WRITE_LOW_PRIORITY</literal>,
-              <literal>MAX_TIMER_WRITE_LOW_PRIORITY</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_WRITE_LOW_PRIORITY</literal>,
+                <literal>SUM_TIMER_WRITE_LOW_PRIORITY</literal>,
+                <literal>MIN_TIMER_WRITE_LOW_PRIORITY</literal>,
+                <literal>AVG_TIMER_WRITE_LOW_PRIORITY</literal>,
+                <literal>MAX_TIMER_WRITE_LOW_PRIORITY</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal write locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal write locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_WRITE_NORMAL</literal>,
-              <literal>SUM_TIMER_WRITE_NORMAL</literal>,
-              <literal>MIN_TIMER_WRITE_NORMAL</literal>,
-              <literal>AVG_TIMER_WRITE_NORMAL</literal>,
-              <literal>MAX_TIMER_WRITE_NORMAL</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_WRITE_NORMAL</literal>,
+                <literal>SUM_TIMER_WRITE_NORMAL</literal>,
+                <literal>MIN_TIMER_WRITE_NORMAL</literal>,
+                <literal>AVG_TIMER_WRITE_NORMAL</literal>,
+                <literal>MAX_TIMER_WRITE_NORMAL</literal>
+              </para>
 
-            <para>
-              These columns aggregate internal write locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate internal write locks.
+              </para>
+            </listitem>
 
-          <listitem>
-            <para>
-              <literal>COUNT_WRITE_EXTERNAL</literal>,
-              <literal>SUM_TIMER_WRITE_EXTERNAL</literal>,
-              <literal>MIN_TIMER_WRITE_EXTERNAL</literal>,
-              <literal>AVG_TIMER_WRITE_EXTERNAL</literal>,
-              <literal>MAX_TIMER_WRITE_EXTERNAL</literal>
-            </para>
+            <listitem>
+              <para>
+                <literal>COUNT_WRITE_EXTERNAL</literal>,
+                <literal>SUM_TIMER_WRITE_EXTERNAL</literal>,
+                <literal>MIN_TIMER_WRITE_EXTERNAL</literal>,
+                <literal>AVG_TIMER_WRITE_EXTERNAL</literal>,
+                <literal>MAX_TIMER_WRITE_EXTERNAL</literal>
+              </para>
 
-            <para>
-              These columns aggregate external write locks.
-            </para>
-          </listitem>
+              <para>
+                These columns aggregate external write locks.
+              </para>
+            </listitem>
 
-        </itemizedlist>
+          </itemizedlist>
 
+        </section>
+
       </section>
 
     </section>


Modified: trunk/refman-6.0/performance-schema-core.xml
===================================================================
--- trunk/refman-6.0/performance-schema-core.xml	2011-04-26 16:39:06 UTC (rev 26017)
+++ trunk/refman-6.0/performance-schema-core.xml	2011-04-26 16:39:14 UTC (rev 26018)
Changed blocks: 5, Lines Added: 14, Lines Deleted: 16; 2151 bytes

@@ -3840,9 +3840,9 @@
         in different ways.
       </para>
 
-<para>
-General Event Wait Summaries:
-</para>
+      <para>
+        General Event Wait Summaries:
+      </para>
 
       <itemizedlist>
 

@@ -3866,14 +3866,15 @@
             Events summarized per event name
           </para>
         </listitem>
+
       </itemizedlist>
 
+      <para>
+        File I/O Summaries:
+      </para>
 
-
-<para>
-File I/O Summaries:
-</para>
       <itemizedlist>
+
         <listitem>
           <para>
             <literal role="ps">file_summary_by_event_name</literal>:

@@ -3892,10 +3893,10 @@
 
       <para>
         Each summary table has grouping columns that are used to group
-        the data to be aggregated, and summary columns that contain
-        the aggregated values. Tables that summarize events in similar
-        ways often have similar sets of summary columns and differ only
-        in the grouping columns used to determine how events are
+        the data to be aggregated, and summary columns that contain the
+        aggregated values. Tables that summarize events in similar ways
+        often have similar sets of summary columns and differ only in
+        the grouping columns used to determine how events are
         aggregated.
       </para>
 

@@ -3910,9 +3911,7 @@
 
       <section id="events-waits-summary-by-xxx-tables">
 
-        <title>The
-          <literal>events_waits_summary_by_<replaceable>xxx</replaceable></literal>
-          Tables</title>
+        <title>Event Wait Summary Tables</title>
 
         <indexterm>
           <primary>performance_schema</primary>

@@ -4086,8 +4085,7 @@
 
       <section id="file-summary-by-xxx-tables">
 
-        <title>The <literal>file_summary_by_<replaceable>xxx</replaceable></literal>
-          Tables</title>
+        <title>File I/O Summary Tables</title>
 
         <indexterm>
           <primary>performance_schema</primary>


Thread
svn commit - mysqldoc@oter02: r26018 - in trunk: . refman-5.5 refman-5.6 refman-6.0paul.dubois26 Apr