Author: paul
Date: 2006-01-09 01:08:43 +0100 (Mon, 09 Jan 2006)
New Revision: 721
Log:
r5958@frost: paul | 2006-01-08 16:46:18 -0600
Make some titles in InnoDB section less generic, reformat others.
Version note about SHOW INNODB STATUS -> SHOW ENGINE INNODB STATUS.
Modified:
trunk/
trunk/refman-4.1/innodb.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.1/innodb.xml
trunk/refman-common/titles.en.ent
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5956
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1994
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5958
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1994
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-01-08 01:33:03 UTC (rev 720)
+++ trunk/refman-4.1/innodb.xml 2006-01-09 00:08:43 UTC (rev 721)
@@ -4892,14 +4892,16 @@
Starting from MySQL 3.23.42, <literal>InnoDB</literal> includes
<literal>InnoDB</literal> Monitors that print information about
the <literal>InnoDB</literal> internal state. Starting from
- MySQL 3.23.52 and 4.0.3, you can use the SQL statement
- <literal>SHOW INNODB STATUS</literal> to fetch the output of the
- standard <literal>InnoDB</literal> Monitor to your SQL client.
- The information is useful in performance tuning. If you are
- using the <command>mysql</command> interactive SQL client, the
- output is more readable if you replace the usual semicolon
- statement terminator by <literal>\G</literal>: For a discussion
- about the <literal>InnoDB</literal> lock modes see
+ MySQL 3.23.52 and 4.0.3, you can use the <literal>SHOW INNODB
+ STATUS</literal> SQL statement at any time to fetch the output
+ of the standard <literal>InnoDB</literal> Monitor to your SQL
+ client. (In MySQL 4.1.2 and up, the statement is <literal>SHOW
+ ENGINE INNODB STATUS</literal>.) The information is useful in
+ performance tuning. If you are using the
+ <command>mysql</command> interactive SQL client, the output is
+ more readable if you replace the usual semicolon statement
+ terminator by <literal>\G</literal>: For a discussion about the
+ <literal>InnoDB</literal> lock modes, see
<xref linkend="innodb-lock-modes"/>.
</para>
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-01-08 01:33:03 UTC (rev 720)
+++ trunk/refman-5.0/innodb.xml 2006-01-09 00:08:43 UTC (rev 721)
@@ -4841,15 +4841,15 @@
<para>
<literal>InnoDB</literal> includes <literal>InnoDB</literal>
Monitors that print information about the
- <literal>InnoDB</literal> internal state. You can use the SQL
- statement <literal>SHOW ENGINE INNODB STATUS</literal> to fetch
- the output of the standard <literal>InnoDB</literal> Monitor to
- your SQL client. This information is useful in performance
- tuning. (If you are using the <command>mysql</command>
- interactive SQL client, the output is more readable if you
- replace the usual semicolon statement terminator with
- <literal>\G</literal>.) For a discussion of
- <literal>InnoDB</literal> lock modes see
+ <literal>InnoDB</literal> internal state. You can use the
+ <literal>SHOW ENGINE INNODB STATUS</literal> SQL statement at
+ any time to fetch the output of the standard
+ <literal>InnoDB</literal> Monitor to your SQL client. This
+ information is useful in performance tuning. (If you are using
+ the <command>mysql</command> interactive SQL client, the output
+ is more readable if you replace the usual semicolon statement
+ terminator with <literal>\G</literal>.) For a discussion of
+ <literal>InnoDB</literal> lock modes, see
<xref linkend="innodb-lock-modes"/>.
</para>
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-01-08 01:33:03 UTC (rev 720)
+++ trunk/refman-5.1/innodb.xml 2006-01-09 00:08:43 UTC (rev 721)
@@ -4802,15 +4802,15 @@
<para>
<literal>InnoDB</literal> includes <literal>InnoDB</literal>
Monitors that print information about the
- <literal>InnoDB</literal> internal state. You can use the SQL
- statement <literal>SHOW ENGINE INNODB STATUS</literal> to fetch
- the output of the standard <literal>InnoDB</literal> Monitor to
- your SQL client. This information is useful in performance
- tuning. (If you are using the <command>mysql</command>
- interactive SQL client, the output is more readable if you
- replace the usual semicolon statement terminator with
- <literal>\G</literal>.) For a discussion of
- <literal>InnoDB</literal> lock modes see
+ <literal>InnoDB</literal> internal state. You can use the
+ <literal>SHOW ENGINE INNODB STATUS</literal> SQL statement at
+ any time to fetch the output of the standard
+ <literal>InnoDB</literal> Monitor to your SQL client. This
+ information is useful in performance tuning. (If you are using
+ the <command>mysql</command> interactive SQL client, the output
+ is more readable if you replace the usual semicolon statement
+ terminator with <literal>\G</literal>.) For a discussion of
+ <literal>InnoDB</literal> lock modes, see
<xref linkend="innodb-lock-modes"/>.
</para>
Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent 2006-01-08 01:33:03 UTC (rev 720)
+++ trunk/refman-common/titles.en.ent 2006-01-09 00:08:43 UTC (rev 721)
@@ -70,7 +70,7 @@
<!ENTITY title-bdb-start "<literal>BDB</literal> Startup Options">
<!ENTITY title-bdb-storage-engine "The <literal>BDB</literal> (<literal>BerkeleyDB</literal>) Storage Engine">
<!ENTITY title-bdb-todo "Things We Need to Fix for <literal>BDB</literal>">
-<!ENTITY title-begin-end "<literal>BEGIN ... END</literal> Compound Statement">
+<!ENTITY title-begin-end "<literal>BEGIN … END</literal> Compound Statement">
<!ENTITY title-beos "BeOS Notes">
<!ENTITY title-binary-log "The Binary Log">
<!ENTITY title-binary-notes-linux "Linux Binary Distribution Notes">
@@ -382,10 +382,10 @@
<!ENTITY title-fetching-spatial-data-in-wkb-format "Fetching Spatial Data in WKB Format">
<!ENTITY title-fetching-spatial-data-in-wkt-format "Fetching Spatial Data in WKT Format">
<!ENTITY title-file-permissions "Problems with File Permissions">
-<!ENTITY title-file-space-management "File Space Management and Disk I/O">
+<!ENTITY title-file-space-management "<literal>InnoDB</literal> File Space Management and Disk I/O">
<!ENTITY title-flow-control-constructs "Flow Control Constructs">
<!ENTITY title-flush "<literal>FLUSH</literal> Syntax">
-<!ENTITY title-forcing-recovery "Forcing Recovery">
+<!ENTITY title-forcing-recovery "Forcing <literal>InnoDB</literal> Recovery">
<!ENTITY title-forums "MySQL Community Support at the MySQL Forums">
<!ENTITY title-freebsd "FreeBSD Notes">
<!ENTITY title-full-disk "How MySQL Handles a Full Disk">
@@ -467,29 +467,29 @@
<!ENTITY title-innodb-adaptive-hash "Adaptive Hash Indexes">
<!ENTITY title-innodb-and-autocommit "<literal>InnoDB</literal> and <literal>AUTOCOMMIT</literal>">
<!ENTITY title-innodb-and-mysql-replication "<literal>InnoDB</literal> and MySQL Replication">
-<!ENTITY title-innodb-auto-increment-column "How an <literal>AUTO_INCREMENT</literal> Column Works in <literal>InnoDB</literal>">
+<!ENTITY title-innodb-auto-increment-column "How <literal>AUTO_INCREMENT</literal> Columns Work in <literal>InnoDB</literal>">
<!ENTITY title-innodb-change-history "Changes in <literal>InnoDB</literal>">
<!ENTITY title-innodb-checkpoints "Checkpoints">
<!ENTITY title-innodb-configuration "<literal>InnoDB</literal> Configuration">
<!ENTITY title-innodb-consistent-read "Consistent Non-Locking Read">
-<!ENTITY title-innodb-consistent-read-example "An Example of How the Consistent Read Works in <literal>InnoDB</literal>">
+<!ENTITY title-innodb-consistent-read-example "An Example of Consistent Read in <literal>InnoDB</literal>">
<!ENTITY title-innodb-contact-information "<literal>InnoDB</literal> Contact Information">
<!ENTITY title-innodb-deadlock-detection "Deadlock Detection and Rollback">
<!ENTITY title-innodb-deadlocks "How to Cope with Deadlocks">
<!ENTITY title-innodb-disk-io "Disk I/O">
<!ENTITY title-innodb-error-codes "<literal>InnoDB</literal> Error Codes">
-<!ENTITY title-innodb-error-handling "InnoDB Error Handling">
+<!ENTITY title-innodb-error-handling "<literal>InnoDB</literal> Error Handling">
<!ENTITY title-innodb-file-defragmenting "Defragmenting a Table">
<!ENTITY title-innodb-file-space "File Space Management">
<!ENTITY title-innodb-foreign-key-constraints "<literal>FOREIGN KEY</literal> Constraints">
-<!ENTITY title-innodb-implicit-command-or-rollback "When Does MySQL Implicitly Commit or Roll Back a Transaction?">
+<!ENTITY title-innodb-implicit-command-or-rollback "Implicit Transaction Commit and Rollback">
<!ENTITY title-innodb-in-mysql-3-23 "<literal>InnoDB</literal> in MySQL 3.23">
<!ENTITY title-innodb-init "Creating the <literal>InnoDB</literal> Tablespace">
<!ENTITY title-innodb-insert-buffering "Insert Buffering">
<!ENTITY title-innodb-lock-modes "<literal>InnoDB</literal> Lock Modes">
-<!ENTITY title-innodb-locking-reads "Locking Reads <literal>SELECT ... FOR UPDATE</literal> and <literal>SELECT ... LOCK IN SHARE MODE</literal>">
+<!ENTITY title-innodb-locking-reads "<literal>SELECT … FOR UPDATE</literal> and <literal>SELECT … LOCK IN SHARE MODE</literal> Locking Reads">
<!ENTITY title-innodb-locks-set "Locks Set by Different SQL Statements in <literal>InnoDB</literal>">
-<!ENTITY title-innodb-monitor "<literal>SHOW INNODB STATUS</literal> and the <literal>InnoDB</literal> Monitors">
+<!ENTITY title-innodb-monitor "<literal>SHOW ENGINE INNODB STATUS</literal> and the <literal>InnoDB</literal> Monitors">
<!ENTITY title-innodb-multi-versioning "Implementation of Multi-Versioning">
<!ENTITY title-innodb-news-3-23-38 "Changes in MySQL/InnoDB-3.23.38, May 12, 2001">
<!ENTITY title-innodb-news-3-23-39 "Changes in MySQL/InnoDB-3.23.39, June 13, 2001">
@@ -543,9 +543,9 @@
<!ENTITY title-innodb-overview "<literal>InnoDB</literal> Overview">
<!ENTITY title-innodb-physical-record "Physical Record Structure">
<!ENTITY title-innodb-physical-structure "Physical Structure of an Index">
-<!ENTITY title-innodb-raw-devices "Using Raw Devices for the Tablespace">
+<!ENTITY title-innodb-raw-devices "Using Raw Devices for the Shared Tablespace">
<!ENTITY title-innodb-restrictions "Restrictions on <literal>InnoDB</literal> Tables">
-<!ENTITY title-innodb-start "<literal>InnoDB</literal> Startup Options">
+<!ENTITY title-innodb-start "<literal>InnoDB</literal> Startup Options and System Variables">
<!ENTITY title-innodb-transaction-isolation "<literal>InnoDB</literal> and <literal>TRANSACTION ISOLATION LEVEL</literal>">
<!ENTITY title-innodb-transaction-model "<literal>InnoDB</literal> Transaction Model and Locking">
<!ENTITY title-innodb-transactions-with-different-apis "How to Use Transactions in <literal>InnoDB</literal> with Different APIs">
@@ -554,7 +554,7 @@
<!ENTITY title-innodb-tuning "<literal>InnoDB</literal> Performance Tuning Tips">
<!ENTITY title-insert "<literal>INSERT</literal> Syntax">
<!ENTITY title-insert-delayed "<literal>INSERT DELAYED</literal> Syntax">
-<!ENTITY title-insert-select "<literal>INSERT ... SELECT</literal> Syntax">
+<!ENTITY title-insert-select "<literal>INSERT … SELECT</literal> Syntax">
<!ENTITY title-insert-speed "Speed of <literal>INSERT</literal> Statements">
<!ENTITY title-install-plugin "<literal>INSTALL PLUGIN</literal> Syntax">
<!ENTITY title-installation-issues "Installation-Related Issues">
@@ -1478,7 +1478,7 @@
<!ENTITY title-security-against-attack "Making MySQL Secure Against Attackers">
<!ENTITY title-security-guidelines "General Security Guidelines">
<!ENTITY title-select "<literal>SELECT</literal> Syntax">
-<!ENTITY title-select-into-statement "<literal>SELECT ... INTO</literal> Statement">
+<!ENTITY title-select-into-statement "<literal>SELECT … INTO</literal> Statement">
<!ENTITY title-select-speed "Speed of <literal>SELECT</literal> Queries">
<!ENTITY title-selecting-all "Selecting All Data">
<!ENTITY title-selecting-columns "Selecting Particular Columns">
@@ -1580,7 +1580,7 @@
<!ENTITY title-symbolic-links-to-tables "Using Symbolic Links for Tables on Unix">
<!ENTITY title-system "System Factors and Startup Parameter Tuning">
<!ENTITY title-system-variables "System Variables">
-<!ENTITY title-table-and-index "Table and Index Structures">
+<!ENTITY title-table-and-index "<literal>InnoDB</literal> Table and Index Structures">
<!ENTITY title-table-cache "How MySQL Opens and Closes Tables">
<!ENTITY title-table-constraints-table "The <literal>INFORMATION_SCHEMA TABLE_CONSTRAINTS</literal> Table">
<!ENTITY title-table-definition-issues "Table Definition-Related Issues">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r721 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 9 Jan |
