From: paul.dubois
Date: December 10 2010 4:21pm
Subject: svn commit - mysqldoc@docsrva: r24370 - in trunk: . refman-5.5 refman-5.6 refman-6.0
List-Archive: http://lists.mysql.com/commits/126540
Message-Id: <201012101621.oBAGLuQR003043@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: paul
Date: 2010-12-10 17:21:56 +0100 (Fri, 10 Dec 2010)
New Revision: 24370
Log:
r37030@dhcp-215: paul | 2010-12-10 10:21:43 -0500
Minor revisions
Modified:
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
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45239
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:37012
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45239
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:37030
Modified: trunk/refman-5.5/performance-schema-core.xml
===================================================================
--- trunk/refman-5.5/performance-schema-core.xml 2010-12-10 16:10:16 UTC (rev 24369)
+++ trunk/refman-5.5/performance-schema-core.xml 2010-12-10 16:21:56 UTC (rev 24370)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 6; 1547 bytes
@@ -3506,7 +3506,7 @@
If the values associated with a given timer name are
NULL, that timer is not supported on your
- platform. The rows that do not have NULL
+ platform. The rows that do not contain NULL
indicate which timers you can use.
@@ -3534,9 +3534,9 @@
The number of timer units per second. For a cycle timer, the
- frequency is generally related to the CPU speed. The
- CYCLE value of 2388761194 was obtained on
- a system with a 2.4GHz processor.
+ frequency is generally related to the CPU speed. For
+ example, on a system with a 2.4GHz processor, the
+ CYCLE may be close to 2400000000.
@@ -3547,8 +3547,8 @@
Indicates the number of timer units by which timer values
- increase at a time. If a timer has a resolution of 10, its
- value increases by 10 each time.
+ increase. If a timer has a resolution of 10, its value
+ increases by 10 each time.
Modified: trunk/refman-5.6/performance-schema-core.xml
===================================================================
--- trunk/refman-5.6/performance-schema-core.xml 2010-12-10 16:10:16 UTC (rev 24369)
+++ trunk/refman-5.6/performance-schema-core.xml 2010-12-10 16:21:56 UTC (rev 24370)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 6; 1547 bytes
@@ -3760,7 +3760,7 @@
If the values associated with a given timer name are
NULL, that timer is not supported on your
- platform. The rows that do not have NULL
+ platform. The rows that do not contain NULL
indicate which timers you can use.
@@ -3788,9 +3788,9 @@
The number of timer units per second. For a cycle timer, the
- frequency is generally related to the CPU speed. The
- CYCLE value of 2388761194 was obtained on
- a system with a 2.4GHz processor.
+ frequency is generally related to the CPU speed. For
+ example, on a system with a 2.4GHz processor, the
+ CYCLE may be close to 2400000000.
@@ -3801,8 +3801,8 @@
Indicates the number of timer units by which timer values
- increase at a time. If a timer has a resolution of 10, its
- value increases by 10 each time.
+ increase. If a timer has a resolution of 10, its value
+ increases by 10 each time.
Modified: trunk/refman-6.0/performance-schema-core.xml
===================================================================
--- trunk/refman-6.0/performance-schema-core.xml 2010-12-10 16:10:16 UTC (rev 24369)
+++ trunk/refman-6.0/performance-schema-core.xml 2010-12-10 16:21:56 UTC (rev 24370)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 6; 1547 bytes
@@ -3530,7 +3530,7 @@
If the values associated with a given timer name are
NULL, that timer is not supported on your
- platform. The rows that do not have NULL
+ platform. The rows that do not contain NULL
indicate which timers you can use.
@@ -3558,9 +3558,9 @@
The number of timer units per second. For a cycle timer, the
- frequency is generally related to the CPU speed. The
- CYCLE value of 2388761194 was obtained on
- a system with a 2.4GHz processor.
+ frequency is generally related to the CPU speed. For
+ example, on a system with a 2.4GHz processor, the
+ CYCLE may be close to 2400000000.
@@ -3571,8 +3571,8 @@
Indicates the number of timer units by which timer values
- increase at a time. If a timer has a resolution of 10, its
- value increases by 10 each time.
+ increase. If a timer has a resolution of 10, its value
+ increases by 10 each time.