List:Commits« Previous MessageNext Message »
From:john.russell Date:August 23 2010 9:03pm
Subject:svn commit - mysqldoc@docsrva: r22393 - trunk/innodb-plugin-1.1
View as plain text  
Author: jrussell
Date: 2010-08-23 23:03:54 +0200 (Mon, 23 Aug 2010)
New Revision: 22393

Log:
Split the original set of InnoDB I_S table definitions into their own files, for easier xincluding
and/or moving between directories.


Added:
   trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmp.xml
   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/Makefile.depends
   trunk/innodb-plugin-1.1/innodb-information-schema.xml
   trunk/innodb-plugin-1.1/innodb-plugin-glossary.xml


Modified: trunk/innodb-plugin-1.1/Makefile.depends
===================================================================
--- trunk/innodb-plugin-1.1/Makefile.depends	2010-08-23 20:11:02 UTC (rev 22392)
+++ trunk/innodb-plugin-1.1/Makefile.depends	2010-08-23 21:03:54 UTC (rev 22393)
Changed blocks: 2, Lines Added: 87, Lines Deleted: 1; 6679 bytes

@@ -141,8 +141,89 @@
 innodb-file-format-manprepped.xml: $(innodb_file_format_SOURCES) $(innodb_file_format_IDMAPS)
 innodb-file-format-remprepped.xml: $(innodb_file_format_SOURCES) $(innodb_file_format_IDMAPS)
 
+innodb_i_s_innodb_cmp_INCLUDES = \
+	innodb-entities.ent
+innodb_i_s_innodb_cmp_IMAGES =
+innodb_i_s_innodb_cmp_SOURCES = innodb-i-s-innodb-cmp.xml $(innodb_i_s_innodb_cmp_INCLUDES)
+innodb_i_s_innodb_cmp_IDMAPS =
+innodb-i-s-innodb-cmp.validpure: $(innodb_i_s_innodb_cmp_SOURCES)
+innodb-i-s-innodb-cmp.titles: $(innodb_i_s_innodb_cmp_SOURCES)
+innodb-i-s-innodb-cmp.useless: $(innodb_i_s_innodb_cmp_SOURCES)
+innodb-i-s-innodb-cmp.valid: $(innodb_i_s_innodb_cmp_SOURCES) $(innodb_i_s_innodb_cmp_IDMAPS)
+innodb-i-s-innodb-cmp.validwarn: $(innodb_i_s_innodb_cmp_SOURCES) $(innodb_i_s_innodb_cmp_IDMAPS)
+innodb-i-s-innodb-cmp-prepped.xml: $(innodb_i_s_innodb_cmp_SOURCES) $(innodb_i_s_innodb_cmp_IDMAPS)
+innodb-i-s-innodb-cmp-helpprepped.xml: $(innodb_i_s_innodb_cmp_SOURCES) $(innodb_i_s_innodb_cmp_IDMAPS)
+innodb-i-s-innodb-cmp-manprepped.xml: $(innodb_i_s_innodb_cmp_SOURCES) $(innodb_i_s_innodb_cmp_IDMAPS)
+innodb-i-s-innodb-cmp-remprepped.xml: $(innodb_i_s_innodb_cmp_SOURCES) $(innodb_i_s_innodb_cmp_IDMAPS)
+
+innodb_i_s_innodb_cmpmem_INCLUDES = \
+	innodb-entities.ent
+innodb_i_s_innodb_cmpmem_IMAGES =
+innodb_i_s_innodb_cmpmem_SOURCES = innodb-i-s-innodb-cmpmem.xml $(innodb_i_s_innodb_cmpmem_INCLUDES)
+innodb_i_s_innodb_cmpmem_IDMAPS =
+innodb-i-s-innodb-cmpmem.validpure: $(innodb_i_s_innodb_cmpmem_SOURCES)
+innodb-i-s-innodb-cmpmem.titles: $(innodb_i_s_innodb_cmpmem_SOURCES)
+innodb-i-s-innodb-cmpmem.useless: $(innodb_i_s_innodb_cmpmem_SOURCES)
+innodb-i-s-innodb-cmpmem.valid: $(innodb_i_s_innodb_cmpmem_SOURCES) $(innodb_i_s_innodb_cmpmem_IDMAPS)
+innodb-i-s-innodb-cmpmem.validwarn: $(innodb_i_s_innodb_cmpmem_SOURCES) $(innodb_i_s_innodb_cmpmem_IDMAPS)
+innodb-i-s-innodb-cmpmem-prepped.xml: $(innodb_i_s_innodb_cmpmem_SOURCES) $(innodb_i_s_innodb_cmpmem_IDMAPS)
+innodb-i-s-innodb-cmpmem-helpprepped.xml: $(innodb_i_s_innodb_cmpmem_SOURCES) $(innodb_i_s_innodb_cmpmem_IDMAPS)
+innodb-i-s-innodb-cmpmem-manprepped.xml: $(innodb_i_s_innodb_cmpmem_SOURCES) $(innodb_i_s_innodb_cmpmem_IDMAPS)
+innodb-i-s-innodb-cmpmem-remprepped.xml: $(innodb_i_s_innodb_cmpmem_SOURCES) $(innodb_i_s_innodb_cmpmem_IDMAPS)
+
+innodb_i_s_innodb_lock_waits_INCLUDES = \
+	innodb-entities.ent
+innodb_i_s_innodb_lock_waits_IMAGES =
+innodb_i_s_innodb_lock_waits_SOURCES = innodb-i-s-innodb-lock-waits.xml $(innodb_i_s_innodb_lock_waits_INCLUDES)
+innodb_i_s_innodb_lock_waits_IDMAPS =
+innodb-i-s-innodb-lock-waits.validpure: $(innodb_i_s_innodb_lock_waits_SOURCES)
+innodb-i-s-innodb-lock-waits.titles: $(innodb_i_s_innodb_lock_waits_SOURCES)
+innodb-i-s-innodb-lock-waits.useless: $(innodb_i_s_innodb_lock_waits_SOURCES)
+innodb-i-s-innodb-lock-waits.valid: $(innodb_i_s_innodb_lock_waits_SOURCES) $(innodb_i_s_innodb_lock_waits_IDMAPS)
+innodb-i-s-innodb-lock-waits.validwarn: $(innodb_i_s_innodb_lock_waits_SOURCES) $(innodb_i_s_innodb_lock_waits_IDMAPS)
+innodb-i-s-innodb-lock-waits-prepped.xml: $(innodb_i_s_innodb_lock_waits_SOURCES) $(innodb_i_s_innodb_lock_waits_IDMAPS)
+innodb-i-s-innodb-lock-waits-helpprepped.xml: $(innodb_i_s_innodb_lock_waits_SOURCES) $(innodb_i_s_innodb_lock_waits_IDMAPS)
+innodb-i-s-innodb-lock-waits-manprepped.xml: $(innodb_i_s_innodb_lock_waits_SOURCES) $(innodb_i_s_innodb_lock_waits_IDMAPS)
+innodb-i-s-innodb-lock-waits-remprepped.xml: $(innodb_i_s_innodb_lock_waits_SOURCES) $(innodb_i_s_innodb_lock_waits_IDMAPS)
+
+innodb_i_s_innodb_locks_INCLUDES = \
+	innodb-entities.ent
+innodb_i_s_innodb_locks_IMAGES =
+innodb_i_s_innodb_locks_SOURCES = innodb-i-s-innodb-locks.xml $(innodb_i_s_innodb_locks_INCLUDES)
+innodb_i_s_innodb_locks_IDMAPS =
+innodb-i-s-innodb-locks.validpure: $(innodb_i_s_innodb_locks_SOURCES)
+innodb-i-s-innodb-locks.titles: $(innodb_i_s_innodb_locks_SOURCES)
+innodb-i-s-innodb-locks.useless: $(innodb_i_s_innodb_locks_SOURCES)
+innodb-i-s-innodb-locks.valid: $(innodb_i_s_innodb_locks_SOURCES) $(innodb_i_s_innodb_locks_IDMAPS)
+innodb-i-s-innodb-locks.validwarn: $(innodb_i_s_innodb_locks_SOURCES) $(innodb_i_s_innodb_locks_IDMAPS)
+innodb-i-s-innodb-locks-prepped.xml: $(innodb_i_s_innodb_locks_SOURCES) $(innodb_i_s_innodb_locks_IDMAPS)
+innodb-i-s-innodb-locks-helpprepped.xml: $(innodb_i_s_innodb_locks_SOURCES) $(innodb_i_s_innodb_locks_IDMAPS)
+innodb-i-s-innodb-locks-manprepped.xml: $(innodb_i_s_innodb_locks_SOURCES) $(innodb_i_s_innodb_locks_IDMAPS)
+innodb-i-s-innodb-locks-remprepped.xml: $(innodb_i_s_innodb_locks_SOURCES) $(innodb_i_s_innodb_locks_IDMAPS)
+
+innodb_i_s_innodb_trx_INCLUDES = \
+	innodb-entities.ent
+innodb_i_s_innodb_trx_IMAGES =
+innodb_i_s_innodb_trx_SOURCES = innodb-i-s-innodb-trx.xml $(innodb_i_s_innodb_trx_INCLUDES)
+innodb_i_s_innodb_trx_IDMAPS = \
+	metadata/innodb-information-schema.idmap
+innodb-i-s-innodb-trx.validpure: $(innodb_i_s_innodb_trx_SOURCES)
+innodb-i-s-innodb-trx.titles: $(innodb_i_s_innodb_trx_SOURCES)
+innodb-i-s-innodb-trx.useless: $(innodb_i_s_innodb_trx_SOURCES)
+innodb-i-s-innodb-trx.valid: $(innodb_i_s_innodb_trx_SOURCES) $(innodb_i_s_innodb_trx_IDMAPS)
+innodb-i-s-innodb-trx.validwarn: $(innodb_i_s_innodb_trx_SOURCES) $(innodb_i_s_innodb_trx_IDMAPS)
+innodb-i-s-innodb-trx-prepped.xml: $(innodb_i_s_innodb_trx_SOURCES) $(innodb_i_s_innodb_trx_IDMAPS)
+innodb-i-s-innodb-trx-helpprepped.xml: $(innodb_i_s_innodb_trx_SOURCES) $(innodb_i_s_innodb_trx_IDMAPS)
+innodb-i-s-innodb-trx-manprepped.xml: $(innodb_i_s_innodb_trx_SOURCES) $(innodb_i_s_innodb_trx_IDMAPS)
+innodb-i-s-innodb-trx-remprepped.xml: $(innodb_i_s_innodb_trx_SOURCES) $(innodb_i_s_innodb_trx_IDMAPS)
+
 innodb_information_schema_INCLUDES = \
-	innodb-entities.ent
+	innodb-entities.ent \
+	innodb-i-s-innodb-cmp.xml \
+	innodb-i-s-innodb-cmpmem.xml \
+	innodb-i-s-innodb-lock-waits.xml \
+	innodb-i-s-innodb-locks.xml \
+	innodb-i-s-innodb-trx.xml
 innodb_information_schema_IMAGES =
 innodb_information_schema_SOURCES = innodb-information-schema.xml $(innodb_information_schema_INCLUDES)
 innodb_information_schema_IDMAPS = \

@@ -279,6 +360,11 @@
 	innodb-downgrading.xml \
 	innodb-entities.ent \
 	innodb-file-format.xml \
+	innodb-i-s-innodb-cmp.xml \
+	innodb-i-s-innodb-cmpmem.xml \
+	innodb-i-s-innodb-lock-waits.xml \
+	innodb-i-s-innodb-locks.xml \
+	innodb-i-s-innodb-trx.xml \
 	innodb-information-schema.xml \
 	innodb-other-changes.xml \
 	innodb-parameter-changes.xml \


Added: trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmp.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmp.xml	                        (rev 0)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmp.xml	2010-08-23 21:03:54 UTC (rev 22393)
Changed blocks: 1, Lines Added: 55, Lines Deleted: 0; 2556 bytes

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE table PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % innodb.entities SYSTEM "innodb-entities.ent">
+  %innodb.entities;
+	]>
+<table id="innodb-information-schema-innodb_cmp_columns_table">
+  <title>Columns of <literal>INNODB_CMP</literal> and
+    <literal>INNODB_CMP_RESET</literal></title>
+  <tgroup cols="2">
+    <colspec colnum="1" colwidth="4*"/>
+    <colspec colnum="2" colwidth="11*"/>
+    <thead>
+      <row>
+        <entry>Column name</entry>
+        <entry>Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><literal>PAGE_SIZE</literal></entry>
+        <entry>Compressed page size in bytes.</entry>
+      </row>
+      <row>
+        <entry><literal>COMPRESS_OPS</literal></entry>
+        <entry>Number of times a B-tree page of the size <literal>PAGE_SIZE</literal>
+          has been compressed. Pages are compressed whenever an empty
+          page is created or the space for the uncompressed modification
+          log runs out.</entry>
+      </row>
+      <row>
+        <entry><literal>COMPRESS_OPS_OK</literal></entry>
+        <entry>Number of times a B-tree page of the size <literal>PAGE_SIZE</literal>
+          has been successfully compressed. This count should never
+          exceed <literal>COMPRESS_OPS</literal>.</entry>
+      </row>
+      <row>
+        <entry><literal>COMPRESS_TIME</literal></entry>
+        <entry>Total time in seconds spent in attempts to compress B-tree pages of the
+          size <literal>PAGE_SIZE</literal>.</entry>
+      </row>
+      <row>
+        <entry><literal>UNCOMPRESS_OPS</literal></entry>
+        <entry>Number of times a B-tree page of the size <literal>PAGE_SIZE</literal>
+          has been uncompressed. B-tree pages are uncompressed whenever
+          compression fails or at first access when the uncompressed
+          page does not exist in the buffer pool.</entry>
+      </row>
+      <row>
+        <entry><literal>UNCOMPRESS_TIME</literal></entry>
+        <entry>Total time in seconds spent in uncompressing B-tree pages of the size
+          <literal>PAGE_SIZE</literal>.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>


Added: trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmpmem.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmpmem.xml	                        (rev 0)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-cmpmem.xml	2010-08-23 21:03:54 UTC (rev 22393)
Changed blocks: 1, Lines Added: 51, Lines Deleted: 0; 2407 bytes

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE table PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % innodb.entities SYSTEM "innodb-entities.ent">
+  %innodb.entities;
+	]>
+<table id="innodb-information-schema-innodb_cmpmem_columns_table">
+  <title>Columns of &INNODB_CMPMEM; and &INNODB_CMPMEM_RESET;</title>
+  <tgroup cols="2">
+    <colspec colnum="1" colwidth="4*"/>
+    <colspec colnum="2" colwidth="11*"/>
+    <thead>
+      <row>
+        <entry>Column name</entry>
+        <entry>Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry><literal>PAGE_SIZE</literal></entry>
+        <entry>Block size in bytes. Each record of this table describes blocks of this
+          size.</entry>
+      </row>
+      <row>
+        <entry><literal>PAGES_USED</literal></entry>
+        <entry>Number of blocks of the size <literal>PAGE_SIZE</literal> that are
+          currently in use.</entry>
+      </row>
+      <row>
+        <entry><literal>PAGES_FREE</literal></entry>
+        <entry>Number of blocks of the size <literal>PAGE_SIZE</literal> that are
+          currently available for allocation. This column shows the
+          external fragmentation in the memory pool. Ideally, these
+          numbers should be at most 1.</entry>
+      </row>
+      <row>
+        <entry><literal>RELOCATION_OPS</literal></entry>
+        <entry>Number of times a block of the size <literal>PAGE_SIZE</literal> has
+          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>
+      </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>
+      </row>
+    </tbody>
+  </tgroup>
+</table>


Added: trunk/innodb-plugin-1.1/innodb-i-s-innodb-lock-waits.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-lock-waits.xml	                        (rev 0)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-lock-waits.xml	2010-08-23 21:03:54 UTC (rev 22393)
Changed blocks: 1, Lines Added: 39, Lines Deleted: 0; 1723 bytes

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE table PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % innodb.entities SYSTEM "innodb-entities.ent">
+  %innodb.entities;
+	]>
+<table id="innodb-information-schema-innodb_lock_waits_columns_table">
+  <title><literal>INNODB_LOCK_WAITS</literal> Columns</title>
+  <tgroup cols="2">
+    <colspec colnum="1" colwidth="3*"/>
+    <colspec colnum="2" colwidth="8*"/>
+    <thead>
+      <row>
+        <entry>Column name</entry>
+        <entry>Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry>&REQUESTING_TRX_ID;</entry>
+        <entry>ID of the requesting transaction.</entry>
+      </row>
+      <row>
+        <entry>&REQUESTED_LOCK_ID;</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>
+      </row>
+      <row>
+        <entry>&BLOCKING_TRX_ID;</entry>
+        <entry>ID of the blocking transaction.</entry>
+      </row>
+      <row>
+        <entry>&BLOCKING_LOCK_ID;</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>
+      </row>
+    </tbody>
+  </tgroup>
+</table>


Added: trunk/innodb-plugin-1.1/innodb-i-s-innodb-locks.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-locks.xml	                        (rev 0)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-locks.xml	2010-08-23 21:03:54 UTC (rev 22393)
Changed blocks: 1, Lines Added: 91, Lines Deleted: 0; 4286 bytes

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE table PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % innodb.entities SYSTEM "innodb-entities.ent">
+  %innodb.entities;
+	]>
+<table id="innodb-information-schema-innodb_locks_columns_table">
+  <title><literal>INNODB_LOCKS</literal> Columns</title>
+  <tgroup cols="2">
+    <colspec colnum="1" colwidth="1*"/>
+    <colspec colnum="2" colwidth="4*"/>
+    <thead>
+      <row>
+        <entry>Column name</entry>
+        <entry>Description</entry>
+      </row>
+    </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>
+      </row>
+      <row>
+        <entry>&LOCK_TRX_ID;</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>
+      </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>
+      </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>
+      </row>
+      <row>
+        <entry>&LOCK_TABLE;</entry>
+        <entry>Name of the table that has been locked or contains locked records.</entry>
+      </row>
+      <row>
+        <entry>&LOCK_INDEX;</entry>
+        <entry>Name of the index if <literal>LOCK_TYPE='RECORD'</literal>, otherwise
+          &NULL;.</entry>
+      </row>
+      <row>
+        <entry>&LOCK_SPACE;</entry>
+        <entry>Tablespace ID of the locked record if
+          <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
+      </row>
+      <row>
+        <entry>&LOCK_PAGE;</entry>
+        <entry>Page number of the locked record if
+          <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
+      </row>
+      <row>
+        <entry>&LOCK_REC;</entry>
+        <entry>Heap number of the locked record within the page if
+          <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
+      </row>
+      <row>
+        <entry>&LOCK_DATA;</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
+          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>
+      </row>
+    </tbody>
+  </tgroup>
+</table>


Added: trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml	                        (rev 0)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml	2010-08-23 21:03:54 UTC (rev 22393)
Changed blocks: 1, Lines Added: 66, Lines Deleted: 0; 2902 bytes

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE table PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % innodb.entities SYSTEM "innodb-entities.ent">
+  %innodb.entities;
+	]>
+<table id="innodb-information-schema-innodb_trx_columns_table">
+  <title><literal>INNODB_TRX</literal> Columns</title>
+  <tgroup cols="2">
+    <colspec colnum="1" colwidth="1*"/>
+    <colspec colnum="2" colwidth="2*"/>
+    <thead>
+      <row>
+        <entry>Column name</entry>
+        <entry>Description</entry>
+      </row>
+    </thead>
+    <tbody>
+      <row>
+        <entry>&TRX_ID;</entry>
+        <entry>Unique transaction ID number, internal to &innodb;.</entry>
+      </row>
+      <row>
+        <entry>&TRX_WEIGHT;</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>
+      </row>
+      <row>
+        <entry>&TRX_STATE;</entry>
+        <entry>Transaction execution state. One of &RUNNING;, &BLOCKED;, &ROLLING_BACK;
+          or &COMMITTING;.</entry>
+      </row>
+      <row>
+        <entry>&TRX_STARTED;</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>
+      </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>
+      </row>
+      <row>
+        <entry>&TRX_MYSQL_THREAD_ID;</entry>
+        <entry>&mysql; thread ID. Can be used for joining with &PROCESSLIST; on &ID;.
+          See
+          <xref
+		linkend="innodb-information-schema-note_inconsistency"/>.</entry>
+      </row>
+      <row>
+        <entry>&TRX_QUERY;</entry>
+        <entry>The SQL query that is being executed by the transaction.</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</table>


Modified: trunk/innodb-plugin-1.1/innodb-information-schema.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-information-schema.xml	2010-08-23 20:11:02 UTC (rev 22392)
+++ trunk/innodb-plugin-1.1/innodb-information-schema.xml	2010-08-23 21:03:54 UTC (rev 22393)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 281; 14115 bytes

@@ -108,56 +108,7 @@
         statistics since &innodb; was started.
       </para>
 
-      <table id="innodb-information-schema-innodb_cmp_columns_table">
-        <title>Columns of <literal>INNODB_CMP</literal> and
-          <literal>INNODB_CMP_RESET</literal></title>
-        <tgroup cols="2">
-          <colspec colnum="1" colwidth="4*"/>
-          <colspec colnum="2" colwidth="11*"/>
-          <thead>
-            <row>
-              <entry>Column name</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry><literal>PAGE_SIZE</literal></entry>
-              <entry>Compressed page size in bytes.</entry>
-            </row>
-            <row>
-              <entry><literal>COMPRESS_OPS</literal></entry>
-              <entry>Number of times a B-tree page of the size <literal>PAGE_SIZE</literal>
-                has been compressed. Pages are compressed whenever an
-                empty page is created or the space for the uncompressed
-                modification log runs out.</entry>
-            </row>
-            <row>
-              <entry><literal>COMPRESS_OPS_OK</literal></entry>
-              <entry>Number of times a B-tree page of the size <literal>PAGE_SIZE</literal>
-                has been successfully compressed. This count should
-                never exceed <literal>COMPRESS_OPS</literal>.</entry>
-            </row>
-            <row>
-              <entry><literal>COMPRESS_TIME</literal></entry>
-              <entry>Total time in seconds spent in attempts to compress B-tree pages of the
-                size <literal>PAGE_SIZE</literal>.</entry>
-            </row>
-            <row>
-              <entry><literal>UNCOMPRESS_OPS</literal></entry>
-              <entry>Number of times a B-tree page of the size <literal>PAGE_SIZE</literal>
-                has been uncompressed. B-tree pages are uncompressed
-                whenever compression fails or at first access when the
-                uncompressed page does not exist in the buffer pool.</entry>
-            </row>
-            <row>
-              <entry><literal>UNCOMPRESS_TIME</literal></entry>
-              <entry>Total time in seconds spent in uncompressing B-tree pages of the size
-                <literal>PAGE_SIZE</literal>.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="innodb-i-s-innodb-cmp.xml"/>
 
     </section>
 

@@ -218,52 +169,7 @@
         the cumulated statistics since &innodb; was started.
       </para>
 
-      <table id="innodb-information-schema-innodb_cmpmem_columns_table">
-        <title>Columns of &INNODB_CMPMEM; and &INNODB_CMPMEM_RESET;</title>
-        <tgroup cols="2">
-          <colspec colnum="1" colwidth="4*"/>
-          <colspec colnum="2" colwidth="11*"/>
-          <thead>
-            <row>
-              <entry>Column name</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry><literal>PAGE_SIZE</literal></entry>
-              <entry>Block size in bytes. Each record of this table describes blocks of this
-                size.</entry>
-            </row>
-            <row>
-              <entry><literal>PAGES_USED</literal></entry>
-              <entry>Number of blocks of the size <literal>PAGE_SIZE</literal> that are
-                currently in use.</entry>
-            </row>
-            <row>
-              <entry><literal>PAGES_FREE</literal></entry>
-              <entry>Number of blocks of the size <literal>PAGE_SIZE</literal> that are
-                currently available for allocation. This column shows
-                the external fragmentation in the memory pool. Ideally,
-                these numbers should be at most 1.</entry>
-            </row>
-            <row>
-              <entry><literal>RELOCATION_OPS</literal></entry>
-              <entry>Number of times a block of the size <literal>PAGE_SIZE</literal> has
-                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>
-            </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>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="innodb-i-s-innodb-cmpmem.xml"/>
 
     </section>
 

@@ -510,69 +416,7 @@
         statement the transaction is executing.
       </para>
 
-      <table id="innodb-information-schema-innodb_trx_columns_table">
-        <title><literal>INNODB_TRX</literal> Columns</title>
-        <tgroup cols="2">
-          <colspec colnum="1" colwidth="1*"/>
-          <colspec colnum="2" colwidth="2*"/>
-          <thead>
-            <row>
-              <entry>Column name</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry>&TRX_ID;</entry>
-              <entry>Unique transaction ID number, internal to &innodb;.</entry>
-            </row>
-            <row>
-              <entry>&TRX_WEIGHT;</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>
-            </row>
-            <row>
-              <entry>&TRX_STATE;</entry>
-              <entry>Transaction execution state. One of &RUNNING;, &BLOCKED;, &ROLLING_BACK;
-                or &COMMITTING;.</entry>
-            </row>
-            <row>
-              <entry>&TRX_STARTED;</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>
-            </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>
-            </row>
-            <row>
-              <entry>&TRX_MYSQL_THREAD_ID;</entry>
-              <entry>&mysql; thread ID. Can be used for joining with &PROCESSLIST; on &ID;.
-                See
-                <xref
-		linkend="innodb-information-schema-note_inconsistency"/>.</entry>
-            </row>
-            <row>
-              <entry>&TRX_QUERY;</entry>
-              <entry>The SQL query that is being executed by the transaction.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="innodb-i-s-innodb-trx.xml"/>
 
     </section>
 

@@ -604,93 +448,7 @@
         exclusive) incompatible with the mode of requested lock.
       </para>
 
-      <table id="innodb-information-schema-innodb_locks_columns_table">
-        <title><literal>INNODB_LOCKS</literal> Columns</title>
-        <tgroup cols="2">
-          <colspec colnum="1" colwidth="1*"/>
-          <colspec colnum="2" colwidth="4*"/>
-          <thead>
-            <row>
-              <entry>Column name</entry>
-              <entry>Description</entry>
-            </row>
-          </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>
-            </row>
-            <row>
-              <entry>&LOCK_TRX_ID;</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>
-            </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>
-            </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>
-            </row>
-            <row>
-              <entry>&LOCK_TABLE;</entry>
-              <entry>Name of the table that has been locked or contains locked records.</entry>
-            </row>
-            <row>
-              <entry>&LOCK_INDEX;</entry>
-              <entry>Name of the index if <literal>LOCK_TYPE='RECORD'</literal>, otherwise
-                &NULL;.</entry>
-            </row>
-            <row>
-              <entry>&LOCK_SPACE;</entry>
-              <entry>Tablespace ID of the locked record if
-                <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
-            </row>
-            <row>
-              <entry>&LOCK_PAGE;</entry>
-              <entry>Page number of the locked record if
-                <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
-            </row>
-            <row>
-              <entry>&LOCK_REC;</entry>
-              <entry>Heap number of the locked record within the page if
-                <literal>LOCK_TYPE='RECORD'</literal>, otherwise &NULL;.</entry>
-            </row>
-            <row>
-              <entry>&LOCK_DATA;</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 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>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="innodb-i-s-innodb-locks.xml"/>
 
     </section>
 

@@ -718,41 +476,7 @@
         &BLOCKING_LOCK_ID;.
       </para>
 
-      <table id="innodb-information-schema-innodb_lock_waits_columns_table">
-        <title><literal>INNODB_LOCK_WAITS</literal> Columns</title>
-        <tgroup cols="2">
-          <colspec colnum="1" colwidth="3*"/>
-          <colspec colnum="2" colwidth="8*"/>
-          <thead>
-            <row>
-              <entry>Column name</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry>&REQUESTING_TRX_ID;</entry>
-              <entry>ID of the requesting transaction.</entry>
-            </row>
-            <row>
-              <entry>&REQUESTED_LOCK_ID;</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>
-            </row>
-            <row>
-              <entry>&BLOCKING_TRX_ID;</entry>
-              <entry>ID of the blocking transaction.</entry>
-            </row>
-            <row>
-              <entry>&BLOCKING_LOCK_ID;</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>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="innodb-i-s-innodb-lock-waits.xml"/>
 
     </section>
 


Modified: trunk/innodb-plugin-1.1/innodb-plugin-glossary.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-plugin-glossary.xml	2010-08-23 20:11:02 UTC (rev 22392)
+++ trunk/innodb-plugin-1.1/innodb-plugin-glossary.xml	2010-08-23 21:03:54 UTC (rev 22393)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 481 bytes

@@ -43,6 +43,7 @@
 &glos_column_index;
 &glos_commit;
 &glos_compact_row_format;
+&glos_composite_index;
 &glos_compressed_row_format;
 &glos_concatenated_index;
 &glos_concurrency;


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