Author: paul
Date: 2006-03-27 18:27:24 +0200 (Mon, 27 Mar 2006)
New Revision: 1688
Log:
r8986@frost: paul | 2006-03-27 10:26:25 -0600
Fold in proof corrections.
Modified:
trunk/
trunk/refman-4.1/innodb.xml
trunk/refman-4.1/storage-engines.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.0/storage-engines.xml
trunk/refman-5.1/innodb.xml
trunk/refman-5.1/storage-engines.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8983
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4118
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8986
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4118
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-03-27 16:26:57 UTC (rev 1687)
+++ trunk/refman-4.1/innodb.xml 2006-03-27 16:27:24 UTC (rev 1688)
@@ -18,10 +18,6 @@
</indexterm>
<indexterm>
- <primary><literal>InnoDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>InnoDB</literal></secondary>
</indexterm>
Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml 2006-03-27 16:26:57 UTC (rev 1687)
+++ trunk/refman-4.1/storage-engines.xml 2006-03-27 16:27:24 UTC (rev 1688)
@@ -35,105 +35,53 @@
</indexterm>
<indexterm>
- <primary>MySQL table types</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BerkeleyDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BerkeleyDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>HEAP</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>HEAP</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>ISAM</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>ISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>InnoDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>InnoDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MEMORY</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MEMORY</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MERGE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MERGE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MyISAM</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MyISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>EXAMPLE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>EXAMPLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>CSV</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>CSV</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>ARCHIVE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>ARCHIVE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BLACKHOLE</literal> storage engine</primary>
</indexterm>
- <indexterm>
- <primary><literal>BLACKHOLE</literal> table type</primary>
- </indexterm>
-
<para>
MySQL supports several storage engines that act as handlers for
different table types. MySQL storage engines include both those that
@@ -443,10 +391,6 @@
</indexterm>
<indexterm>
- <primary><literal>MyISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MyISAM</literal></secondary>
</indexterm>
@@ -1626,10 +1570,6 @@
</indexterm>
<indexterm>
- <primary><literal>MERGE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MERGE</literal></secondary>
</indexterm>
@@ -2125,18 +2065,10 @@
</indexterm>
<indexterm>
- <primary><literal>HEAP</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MEMORY</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MEMORY</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MEMORY</literal></secondary>
</indexterm>
@@ -2462,18 +2394,10 @@
</indexterm>
<indexterm>
- <primary><literal>BDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BerkeleyDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BerkeleyDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>BDB</literal></secondary>
</indexterm>
@@ -3386,10 +3310,6 @@
</indexterm>
<indexterm>
- <primary><literal>EXAMPLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>EXAMPLE</secondary>
</indexterm>
@@ -3450,19 +3370,10 @@
</indexterm>
<indexterm>
- <primary><literal>ARCHIVE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>storage engine</primary>
<secondary>ARCHIVE</secondary>
</indexterm>
- <indexterm>
- <primary>tables</primary>
- <secondary>ARCHIVE</secondary>
- </indexterm>
-
<para>
The <literal>ARCHIVE</literal> storage engine was added in MySQL
4.1.3. It is used for storing large amounts of data without
@@ -3596,10 +3507,6 @@
</indexterm>
<indexterm>
- <primary><literal>CSV</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>CSV</secondary>
</indexterm>
@@ -3685,10 +3592,6 @@
</indexterm>
<indexterm>
- <primary><literal>BLACKHOLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>BLACKHOLE</secondary>
</indexterm>
@@ -3830,10 +3733,6 @@
</indexterm>
<indexterm>
- <primary><literal>ISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>ISAM</secondary>
</indexterm>
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-03-27 16:26:57 UTC (rev 1687)
+++ trunk/refman-5.0/innodb.xml 2006-03-27 16:27:24 UTC (rev 1688)
@@ -18,10 +18,6 @@
</indexterm>
<indexterm>
- <primary><literal>InnoDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>InnoDB</literal></secondary>
</indexterm>
Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml 2006-03-27 16:26:57 UTC (rev 1687)
+++ trunk/refman-5.0/storage-engines.xml 2006-03-27 16:27:24 UTC (rev 1688)
@@ -35,105 +35,53 @@
</indexterm>
<indexterm>
- <primary>MySQL table types</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BerkeleyDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BerkeleyDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>HEAP</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>HEAP</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>InnoDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>InnoDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MEMORY</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MEMORY</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MERGE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MERGE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MyISAM</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MyISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>EXAMPLE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>EXAMPLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>CSV</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>CSV</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>ARCHIVE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>ARCHIVE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BLACKHOLE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BLACKHOLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>FEDERATED</literal> storage engine</primary>
</indexterm>
- <indexterm>
- <primary><literal>FEDERATED</literal> table type</primary>
- </indexterm>
-
<para>
MySQL supports several storage engines that act as handlers for
different table types. MySQL storage engines include both those that
@@ -442,10 +390,6 @@
</indexterm>
<indexterm>
- <primary><literal>MyISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MyISAM</literal></secondary>
</indexterm>
@@ -1622,10 +1566,6 @@
</indexterm>
<indexterm>
- <primary><literal>MERGE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MERGE</literal></secondary>
</indexterm>
@@ -2083,18 +2023,10 @@
</indexterm>
<indexterm>
- <primary><literal>HEAP</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MEMORY</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MEMORY</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MEMORY</literal></secondary>
</indexterm>
@@ -2413,18 +2345,10 @@
</indexterm>
<indexterm>
- <primary><literal>BDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BerkeleyDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BerkeleyDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>BDB</literal></secondary>
</indexterm>
@@ -3340,10 +3264,6 @@
</indexterm>
<indexterm>
- <primary><literal>EXAMPLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>EXAMPLE</secondary>
</indexterm>
@@ -3404,10 +3324,6 @@
</indexterm>
<indexterm>
- <primary><literal>FEDERATED</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>FEDERATED</secondary>
</indexterm>
@@ -3781,19 +3697,10 @@
</indexterm>
<indexterm>
- <primary><literal>ARCHIVE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>storage engine</primary>
<secondary>ARCHIVE</secondary>
</indexterm>
- <indexterm>
- <primary>tables</primary>
- <secondary>ARCHIVE</secondary>
- </indexterm>
-
<para>
The <literal>ARCHIVE</literal> storage engine is used for storing
large amounts of data without indexes in a very small footprint.
@@ -3927,10 +3834,6 @@
</indexterm>
<indexterm>
- <primary><literal>CSV</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>CSV</secondary>
</indexterm>
@@ -4015,10 +3918,6 @@
</indexterm>
<indexterm>
- <primary><literal>BLACKHOLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>BLACKHOLE</secondary>
</indexterm>
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-03-27 16:26:57 UTC (rev 1687)
+++ trunk/refman-5.1/innodb.xml 2006-03-27 16:27:24 UTC (rev 1688)
@@ -18,10 +18,6 @@
</indexterm>
<indexterm>
- <primary><literal>InnoDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>InnoDB</literal></secondary>
</indexterm>
Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml 2006-03-27 16:26:57 UTC (rev 1687)
+++ trunk/refman-5.1/storage-engines.xml 2006-03-27 16:27:24 UTC (rev 1688)
@@ -35,105 +35,53 @@
</indexterm>
<indexterm>
- <primary>MySQL table types</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BerkeleyDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BerkeleyDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>HEAP</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>HEAP</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>InnoDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>InnoDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MEMORY</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MEMORY</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MERGE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MERGE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MyISAM</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MyISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>EXAMPLE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>EXAMPLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>CSV</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>CSV</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>ARCHIVE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>ARCHIVE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BLACKHOLE</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BLACKHOLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>FEDERATED</literal> storage engine</primary>
</indexterm>
- <indexterm>
- <primary><literal>FEDERATED</literal> table type</primary>
- </indexterm>
-
<para>
MySQL supports several storage engines that act as handlers for
different table types. MySQL storage engines include both those that
@@ -428,10 +376,6 @@
</indexterm>
<indexterm>
- <primary><literal>MyISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MyISAM</literal></secondary>
</indexterm>
@@ -1570,10 +1514,6 @@
</indexterm>
<indexterm>
- <primary><literal>MERGE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MERGE</literal></secondary>
</indexterm>
@@ -2024,18 +1964,10 @@
</indexterm>
<indexterm>
- <primary><literal>HEAP</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>MEMORY</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>MEMORY</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>MEMORY</literal></secondary>
</indexterm>
@@ -2347,18 +2279,10 @@
</indexterm>
<indexterm>
- <primary><literal>BDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>BerkeleyDB</literal> storage engine</primary>
</indexterm>
<indexterm>
- <primary><literal>BerkeleyDB</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary><literal>BDB</literal></secondary>
</indexterm>
@@ -3311,10 +3235,6 @@
</indexterm>
<indexterm>
- <primary><literal>EXAMPLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>EXAMPLE</secondary>
</indexterm>
@@ -3375,10 +3295,6 @@
</indexterm>
<indexterm>
- <primary><literal>FEDERATED</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>FEDERATED</secondary>
</indexterm>
@@ -3753,19 +3669,10 @@
</indexterm>
<indexterm>
- <primary><literal>ARCHIVE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>storage engine</primary>
<secondary>ARCHIVE</secondary>
</indexterm>
- <indexterm>
- <primary>tables</primary>
- <secondary>ARCHIVE</secondary>
- </indexterm>
-
<para>
The <literal>ARCHIVE</literal> storage engine is used for storing
large amounts of data without indexes in a very small footprint.
@@ -3925,10 +3832,6 @@
</indexterm>
<indexterm>
- <primary><literal>CSV</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>CSV</secondary>
</indexterm>
@@ -4013,10 +3916,6 @@
</indexterm>
<indexterm>
- <primary><literal>BLACKHOLE</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary>tables</primary>
<secondary>BLACKHOLE</secondary>
</indexterm>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1688 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 27 Mar |
