Author: jstephens
Date: 2009-11-20 09:45:54 +0100 (Fri, 20 Nov 2009)
New Revision: 17735
Log:
Fix typos/grammar/usage in se-merge (Thanks, James!)
Modified:
trunk/refman-4.1/storage-engines.xml
trunk/refman-5.0/se-merge.xml
trunk/refman-5.1/se-merge.xml
trunk/refman-5.4/se-merge.xml
trunk/refman-5.5/se-merge.xml
trunk/refman-6.0.sav/se-merge.xml
Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml 2009-11-20 02:32:35 UTC (rev 17734)
+++ trunk/refman-4.1/storage-engines.xml 2009-11-20 08:45:54 UTC (rev 17735)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1150 bytes
@@ -1908,14 +1908,15 @@
<listitem>
<para>
- Underlying table must have at least the same amount of keys
- that merge table has. The underlying table may have more keys
- than the <literal>MERGE</literal> table, but cannot have less.
+ The underlying table must have at least the same number of
+ keys that the <literal>MERGE</literal> table has. The
+ underlying table may have more keys than the
+ <literal>MERGE</literal> table, but cannot have any fewer.
</para>
<note>
<para>
- A known issue exists that keys on the some columns must be
+ A known issue exists where keys on the same columns must be
identical in order in both the <literal>MERGE</literal>
table and the underlying <literal>MyISAM</literal> table.
See Bug#33653.
Modified: trunk/refman-5.0/se-merge.xml
===================================================================
--- trunk/refman-5.0/se-merge.xml 2009-11-20 02:32:35 UTC (rev 17734)
+++ trunk/refman-5.0/se-merge.xml 2009-11-20 08:45:54 UTC (rev 17735)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1094 bytes
@@ -222,14 +222,15 @@
<listitem>
<para>
- Underlying table must have at least the same amount of keys that
- merge table has. The underlying table may have more keys than
- the <literal>MERGE</literal> table, but cannot have less.
+ The underlying table must have at least the same number of keys
+ that the <literal>MERGE</literal> table has. The underlying
+ table may have more keys than the <literal>MERGE</literal>
+ table, but cannot have any fewer.
</para>
<note>
<para>
- A known issue exists that keys on the some columns must be
+ A known issue exists where keys on the same columns must be
identical in order in both the <literal>MERGE</literal> table
and the underlying <literal>MyISAM</literal> table. See Bug
#33653.
Modified: trunk/refman-5.1/se-merge.xml
===================================================================
--- trunk/refman-5.1/se-merge.xml 2009-11-20 02:32:35 UTC (rev 17734)
+++ trunk/refman-5.1/se-merge.xml 2009-11-20 08:45:54 UTC (rev 17735)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 591 bytes
@@ -208,7 +208,7 @@
<note>
<para>
- A known issue exists that keys on the some columns must be
+ A known issue exists where keys on the same columns must be
identical in order in both the <literal>MERGE</literal> table
and the underlying <literal>MyISAM</literal> table. See Bug
#33653.
Modified: trunk/refman-5.4/se-merge.xml
===================================================================
--- trunk/refman-5.4/se-merge.xml 2009-11-20 02:32:35 UTC (rev 17734)
+++ trunk/refman-5.4/se-merge.xml 2009-11-20 08:45:54 UTC (rev 17735)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1094 bytes
@@ -200,14 +200,15 @@
<listitem>
<para>
- Underlying table must have at least the same amount of keys that
- merge table has. The underlying table may have more keys than
- the <literal>MERGE</literal> table, but cannot have less.
+ The underlying table must have at least the same number of keys
+ that the <literal>MERGE</literal> table has. The underlying
+ table may have more keys than the <literal>MERGE</literal>
+ table, but cannot have any fewer.
</para>
<note>
<para>
- A known issue exists that keys on the some columns must be
+ A known issue exists where keys on the same columns must be
identical in order in both the <literal>MERGE</literal> table
and the underlying <literal>MyISAM</literal> table. See Bug
#33653.
Modified: trunk/refman-5.5/se-merge.xml
===================================================================
--- trunk/refman-5.5/se-merge.xml 2009-11-20 02:32:35 UTC (rev 17734)
+++ trunk/refman-5.5/se-merge.xml 2009-11-20 08:45:54 UTC (rev 17735)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1094 bytes
@@ -200,14 +200,15 @@
<listitem>
<para>
- Underlying table must have at least the same amount of keys that
- merge table has. The underlying table may have more keys than
- the <literal>MERGE</literal> table, but cannot have less.
+ The underlying table must have at least the same number of keys
+ that the <literal>MERGE</literal> table has. The underlying
+ table may have more keys than the <literal>MERGE</literal>
+ table, but cannot have any fewer.
</para>
<note>
<para>
- A known issue exists that keys on the some columns must be
+ A known issue exists where keys on the same columns must be
identical in order in both the <literal>MERGE</literal> table
and the underlying <literal>MyISAM</literal> table. See Bug
#33653.
Modified: trunk/refman-6.0.sav/se-merge.xml
===================================================================
--- trunk/refman-6.0.sav/se-merge.xml 2009-11-20 02:32:35 UTC (rev 17734)
+++ trunk/refman-6.0.sav/se-merge.xml 2009-11-20 08:45:54 UTC (rev 17735)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1106 bytes
@@ -200,14 +200,15 @@
<listitem>
<para>
- Underlying table must have at least the same amount of keys that
- merge table has. The underlying table may have more keys than
- the <literal>MERGE</literal> table, but cannot have less.
+ The underlying table must have at least the same number of keys
+ that the <literal>MERGE</literal> table has. The underlying
+ table may have more keys than the <literal>MERGE</literal>
+ table, but cannot have any fewer.
</para>
<note>
<para>
- A known issue exists that keys on the some columns must be
+ A known issue exists where keys on the same columns must be
identical in order in both the <literal>MERGE</literal> table
and the underlying <literal>MyISAM</literal> table. See Bug
#33653.
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r17735 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-5.5 refman-6.0.sav | jon.stephens | 20 Nov |
