List:Commits« Previous MessageNext Message »
From:john.russell Date:August 25 2010 6:34pm
Subject:svn commit - mysqldoc@docsrva: r22441 - trunk/innodb-plugin-1.1
View as plain text  
Author: jrussell
Date: 2010-08-25 20:34:36 +0200 (Wed, 25 Aug 2010)
New Revision: 22441

Log:
Got rid of entities used as shorthand for <literal>column_name</literal>.
Turned some links to the MySQL site into normal xrefs.


Modified:
   trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmpmem.xml
   trunk/innodb-plugin-1.1/innodb-i-s-innodb-lock-waits.xml
   trunk/innodb-plugin-1.1/innodb-i-s-innodb-locks.xml
   trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml


Modified: trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmpmem.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmpmem.xml	2010-08-25 17:32:43 UTC (rev 22440)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmpmem.xml	2010-08-25 18:34:36 UTC (rev 22441)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1414 bytes

@@ -4,7 +4,7 @@
   %innodb.entities;
 	]>
 <table id="innodb-information-schema-innodb_cmpmem_columns_table">
-  <title>Columns of &INNODB_CMPMEM; and &INNODB_CMPMEM_RESET;</title>
+  <title>Columns of INNODB_CMPMEM and INNODB_CMPMEM_RESET</title>
   <tgroup cols="2">
     <colspec colnum="1" colwidth="4*"/>
     <colspec colnum="2" colwidth="11*"/>

@@ -38,13 +38,13 @@
           been relocated. The buddy system can relocate the allocated
           <quote>buddy neighbor</quote> of a freed block when it tries
           to form a bigger freed block. Reading from the table
-          &INNODB_CMPMEM_RESET; resets this count.</entry>
+          <literal>INNODB_CMPMEM_RESET</literal> resets this count.</entry>
       </row>
       <row>
         <entry><literal>RELOCATION_TIME</literal></entry>
         <entry>Total time in microseconds spent in relocating blocks of the size
           <literal>PAGE_SIZE</literal>. Reading from the table
-          &INNODB_CMPMEM_RESET; resets this count.</entry>
+          <literal>INNODB_CMPMEM_RESET</literal> resets this count.</entry>
       </row>
     </tbody>
   </tgroup>


Modified: trunk/innodb-plugin-1.1/innodb-i-s-innodb-lock-waits.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-lock-waits.xml	2010-08-25 17:32:43 UTC (rev 22440)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-lock-waits.xml	2010-08-25 18:34:36 UTC (rev 22441)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 6; 1603 bytes

@@ -16,23 +16,25 @@
     </thead>
     <tbody>
       <row>
-        <entry>&REQUESTING_TRX_ID;</entry>
+        <entry><literal>REQUESTING_TRX_ID</literal></entry>
         <entry>ID of the requesting transaction.</entry>
       </row>
       <row>
-        <entry>&REQUESTED_LOCK_ID;</entry>
+        <entry><literal>REQUESTED_LOCK_ID</literal></entry>
         <entry>ID of the lock for which a transaction is waiting. Details about the
-          lock can be found by joining with &INNODB_LOCKS; on &LOCK_ID;.</entry>
+          lock can be found by joining with
+          <literal>INNODB_LOCKS</literal> on <literal>LOCK_ID</literal>.</entry>
       </row>
       <row>
-        <entry>&BLOCKING_TRX_ID;</entry>
+        <entry><literal>BLOCKING_TRX_ID</literal></entry>
         <entry>ID of the blocking transaction.</entry>
       </row>
       <row>
-        <entry>&BLOCKING_LOCK_ID;</entry>
+        <entry><literal>BLOCKING_LOCK_ID</literal></entry>
         <entry>ID of a lock held by a transaction blocking another transaction from
           proceeding. Details about the lock can be found by joining
-          with &INNODB_LOCKS; on &LOCK_ID;.</entry>
+          with <literal>INNODB_LOCKS</literal> on
+          <literal>LOCK_ID</literal>.</entry>
       </row>
     </tbody>
   </tgroup>


Modified: trunk/innodb-plugin-1.1/innodb-i-s-innodb-locks.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-locks.xml	2010-08-25 17:32:43 UTC (rev 22440)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-locks.xml	2010-08-25 18:34:36 UTC (rev 22441)
Changed blocks: 1, Lines Added: 50, Lines Deleted: 42; 6704 bytes

@@ -16,75 +16,83 @@
     </thead>
     <tbody>
       <row>
-        <entry>&LOCK_ID;</entry>
-        <entry>Unique lock ID number, internal to &innodb;. Should be treated as an
-          opaque string. Although &LOCK_ID; currently contains &TRX_ID;,
-          the format of the data in &LOCK_ID; is not guaranteed to
-          remain the same in future releases. You should not write
-          programs that parse the &LOCK_ID; value.</entry>
+        <entry><literal>LOCK_ID</literal></entry>
+        <entry>Unique lock ID number, internal to <literal>InnoDB</literal>. Should be
+          treated as an opaque string. Although
+          <literal>LOCK_ID</literal> currently contains
+          <literal>TRX_ID</literal>, the format of the data in
+          <literal>LOCK_ID</literal> is not guaranteed to remain the
+          same in future releases. You should not write programs that
+          parse the <literal>LOCK_ID</literal> value.</entry>
       </row>
       <row>
-        <entry>&LOCK_TRX_ID;</entry>
+        <entry><literal>LOCK_TRX_ID</literal></entry>
         <entry>ID of the transaction holding this lock. Details about the transaction
-          can be found by joining with &INNODB_TRX; on &TRX_ID;.</entry>
+          can be found by joining with <literal>INNODB_TRX</literal> on
+          <literal>TRX_ID</literal>.</entry>
       </row>
       <row>
-        <entry>&LOCK_MODE;</entry>
-        <entry>Mode of the lock. One of &S;, &X;, &IS;, &IX;, &S_GAP;, &X_GAP;,
-          &IS_GAP;, &IX_GAP;, or &AUTO_INC; for shared, exclusive,
-          intention shared, intention exclusive row locks, shared and
-          exclusive gap locks, intention shared and intension exclusive
-          gap locks, and auto-increment table level lock, respectively.
-          Refer to the sections
-          <ulink url="http://dev.mysql.com/doc/refman/5.1/en/innodb-lock-modes.html">
-          &innodb; Lock Modes </ulink> and
-          <ulink url="http://dev.mysql.com/doc/refman/5.1/en/innodb-transaction-isolation.html">
-          &innodb; and <literal>TRANSACTION ISOLATION LEVEL</literal>
-          </ulink> of the MySQL Manual for information on &innodb;
-          locking.</entry>
+        <entry><literal>LOCK_MODE</literal></entry>
+        <entry>Mode of the lock. One of <literal>S</literal>, <literal>X</literal>,
+          <literal>IS</literal>, <literal>IX</literal>,
+          <literal>S_GAP</literal>, <literal>X_GAP</literal>,
+          <literal>IS_GAP</literal>, <literal>IX_GAP</literal>, or
+          <literal>AUTO_INC</literal> for shared, exclusive, intention
+          shared, intention exclusive row locks, shared and exclusive
+          gap locks, intention shared and intension exclusive gap locks,
+          and auto-increment table level lock, respectively. Refer to
+          the sections <xref linkend="innodb-lock-modes"/> and
+          <xref linkend="innodb-transaction-model"/> for information
+          on <literal>InnoDB</literal> locking.</entry>
       </row>
       <row>
-        <entry>&LOCK_TYPE;</entry>
-        <entry>Type of the lock. One of &RECORD; or &TABLE; for record (row) level or
-          table level locks, respectively.</entry>
+        <entry><literal>LOCK_TYPE</literal></entry>
+        <entry>Type of the lock. One of <literal>RECORD</literal> or
+          <literal>TABLE</literal> for record (row) level or table level
+          locks, respectively.</entry>
       </row>
       <row>
-        <entry>&LOCK_TABLE;</entry>
+        <entry><literal>LOCK_TABLE</literal></entry>
         <entry>Name of the table that has been locked or contains locked records.</entry>
       </row>
       <row>
-        <entry>&LOCK_INDEX;</entry>
+        <entry><literal>LOCK_INDEX</literal></entry>
         <entry>Name of the index if <literal>LOCK_TYPE='RECORD'</literal>, otherwise
-          &NULL;.</entry>
+          <literal>NULL</literal>.</entry>
       </row>
       <row>
-        <entry>&LOCK_SPACE;</entry>
+        <entry><literal>LOCK_SPACE</literal></entry>
         <entry>Tablespace ID of the locked record if
-          <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
+          <literal>LOCK_TYPE='RECORD'</literal>, otherwise
+          <literal>NULL</literal>.</entry>
       </row>
       <row>
-        <entry>&LOCK_PAGE;</entry>
+        <entry><literal>LOCK_PAGE</literal></entry>
         <entry>Page number of the locked record if
-          <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
+          <literal>LOCK_TYPE='RECORD'</literal>, otherwise
+          <literal>NULL</literal>.</entry>
       </row>
       <row>
-        <entry>&LOCK_REC;</entry>
+        <entry><literal>LOCK_REC</literal></entry>
         <entry>Heap number of the locked record within the page if
-          <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
+          <literal>LOCK_TYPE='RECORD'</literal>, otherwise
+          <literal>NULL</literal>.</entry>
       </row>
       <row>
-        <entry>&LOCK_DATA;</entry>
+        <entry><literal>LOCK_DATA</literal></entry>
         <entry>Primary key of the locked record if
-          <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;. This
-          column contains the value(s) of the primary key column(s) in
-          the locked row, formatted as a valid SQL string (ready to be
-          copied to SQL commands). If there is no primary key then the
-          &innodb; internal unique row ID number is used. When the page
+          <literal>LOCK_TYPE='RECORD'</literal>, otherwise
+          <literal>NULL</literal>. This column contains the value(s) of
+          the primary key column(s) in the locked row, formatted as a
+          valid SQL string (ready to be copied to SQL commands). If
+          there is no primary key then the <literal>InnoDB</literal>
+          internal unique row ID number is used. When the page
           containing the locked record is not in the buffer pool (in the
           case that it was paged out to disk while the lock was held),
-          &innodb; does not fetch the page from disk, to avoid
-          unnecessary disk operations. Instead, &LOCK_DATA; is set to
-          &NULL;.</entry>
+          <literal>InnoDB</literal> does not fetch the page from disk,
+          to avoid unnecessary disk operations. Instead,
+          <literal>LOCK_DATA</literal> is set to
+          <literal>NULL</literal>.</entry>
       </row>
     </tbody>
   </tgroup>


Modified: trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml	2010-08-25 17:32:43 UTC (rev 22440)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml	2010-08-25 18:34:36 UTC (rev 22441)
Changed blocks: 1, Lines Added: 28, Lines Deleted: 23; 4107 bytes

@@ -16,49 +16,54 @@
     </thead>
     <tbody>
       <row>
-        <entry>&TRX_ID;</entry>
-        <entry>Unique transaction ID number, internal to &innodb;.</entry>
+        <entry><literal>TRX_ID</literal></entry>
+        <entry>Unique transaction ID number, internal to <literal>InnoDB</literal>.</entry>
       </row>
       <row>
-        <entry>&TRX_WEIGHT;</entry>
+        <entry><literal>TRX_WEIGHT</literal></entry>
         <entry>The weight of a transaction, reflecting (but not necessarily the exact
           count of) the number of rows altered and the number of rows
-          locked by the transaction. To resolve a deadlock, &innodb;
-          selects the transaction with the smallest weight as the
-          <quote>victim</quote> to rollback. Transactions that have
-          changed non-transactional tables are considered heavier than
-          others, regardless of the number of altered and locked rows.</entry>
+          locked by the transaction. To resolve a deadlock,
+          <literal>InnoDB</literal> selects the transaction with the
+          smallest weight as the <quote>victim</quote> to rollback.
+          Transactions that have changed non-transactional tables are
+          considered heavier than others, regardless of the number of
+          altered and locked rows.</entry>
       </row>
       <row>
-        <entry>&TRX_STATE;</entry>
-        <entry>Transaction execution state. One of &RUNNING;, &BLOCKED;, &ROLLING_BACK;
-          or &COMMITTING;.</entry>
+        <entry><literal>TRX_STATE</literal></entry>
+        <entry>Transaction execution state. One of <literal>RUNNING</literal>,
+          <literal>BLOCKED</literal>, <literal>ROLLING_BACK</literal> or
+          <literal>COMMITTING</literal>.</entry>
       </row>
       <row>
-        <entry>&TRX_STARTED;</entry>
+        <entry><literal>TRX_STARTED</literal></entry>
         <entry>Transaction start time; the transaction is created by executing a
           transactional query.</entry>
       </row>
       <row>
-        <entry>&TRX_REQUESTED_LOCK_ID;</entry>
-        <entry>ID of the lock the transaction is currently waiting for (if &TRX_STATE;
-          is &BLOCKED;, otherwise &NULL;). Details about the lock can be
-          found by joining with &INNODB_LOCKS; on &LOCK_ID;.</entry>
+        <entry><literal>TRX_REQUESTED_LOCK_ID</literal></entry>
+        <entry>ID of the lock the transaction is currently waiting for (if
+          <literal>TRX_STATE</literal> is <literal>BLOCKED</literal>,
+          otherwise <literal>NULL</literal>). Details about the lock can
+          be found by joining with <literal>INNODB_LOCKS</literal> on
+          <literal>LOCK_ID</literal>.</entry>
       </row>
       <row>
-        <entry>&TRX_WAIT_STARTED;</entry>
-        <entry>Time when the transaction started waiting on the lock (if &TRX_STATE; is
-          &BLOCKED;, otherwise &NULL;).</entry>
+        <entry><literal>TRX_WAIT_STARTED</literal></entry>
+        <entry>Time when the transaction started waiting on the lock (if
+          <literal>TRX_STATE</literal> is <literal>BLOCKED</literal>,
+          otherwise <literal>NULL</literal>).</entry>
       </row>
       <row>
-        <entry>&TRX_MYSQL_THREAD_ID;</entry>
-        <entry>&mysql; thread ID. Can be used for joining with &PROCESSLIST; on &ID;.
-          See
+        <entry><literal>TRX_MYSQL_THREAD_ID</literal></entry>
+        <entry>MySQL thread ID. Can be used for joining with
+          <literal>PROCESSLIST</literal> on <literal>ID</literal>. See
           <xref
 		linkend="innodb-information-schema-note_inconsistency"/>.</entry>
       </row>
       <row>
-        <entry>&TRX_QUERY;</entry>
+        <entry><literal>TRX_QUERY</literal></entry>
         <entry>The SQL query that is being executed by the transaction.</entry>
       </row>
     </tbody>


Thread
svn commit - mysqldoc@docsrva: r22441 - trunk/innodb-plugin-1.1john.russell25 Aug