svn commit - mysqldoc@docsrva: r10530 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0

[paul]

Author: paul
Date: 2008-04-18 17:02:23 +0200 (Fri, 18 Apr 2008)
New Revision: 10530

Log:
 r30804@frost:  paul | 2008-04-18 09:57:18 -0500
 Fix MERGE typos. (Shane)
 Sync to translation dirs


Modified:
   trunk/it/refman-5.1/se-merge.xml
   trunk/pt/refman-5.1/se-merge.xml
   trunk/refman-4.1/storage-engines.xml
   trunk/refman-5.0/se-merge.xml
   trunk/refman-5.1/se-merge.xml
   trunk/refman-6.0/se-merge.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30785
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30827
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30804
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30827


Modified: trunk/it/refman-5.1/se-merge.xml
===================================================================
--- trunk/it/refman-5.1/se-merge.xml	2008-04-18 14:44:26 UTC (rev 10529)
+++ trunk/it/refman-5.1/se-merge.xml	2008-04-18 15:02:23 UTC (rev 10530)
Changed blocks: 4, Lines Added: 26, Lines Deleted: 7; 2549 bytes

@@ -206,9 +206,16 @@
         merge table has. The underlying table may have morekeys than the
         <literal>MERGE</literal> table, but cannot have less.
       </para>
-    </listitem>
 
-    <listitem>
+      <note>
+        <para>
+          A known issue exists that keys on the some columns must be
+          identical in order in both the <literal>MERGE</literal> table
+          and the underlying <literal>MyISAM</literal> table. See Bug
+          #33653.
+        </para>
+      </note>
+
       <para>
         For each key:
       </para>

@@ -308,6 +315,13 @@
         Use <literal>ALTER TABLE <replaceable>tbl_name</replaceable>
         UNION=(...)</literal> to change the list of underlying tables.
       </para>
+
+      <para>
+        Beginning with MySQL 5.1.24, it is also possible to use
+        <literal>ALTER TABLE ... UNION=()</literal> (that is, with an
+        empty <literal>UNION</literal> clause) to remove all of the
+        underlying tables. (Bug #28248)
+      </para>
     </listitem>
 
   </itemizedlist>

@@ -619,9 +633,9 @@
 
         <para>
           Because these checks take place when the tables are opened,
-          any changes to the definition of a single, including column
-          changes, ocolumn ordering and engine alterations will cause
-          the statement to fail.
+          any changes to the definition of a single table, including
+          column changes, column ordering and engine alterations will
+          cause the statement to fail.
         </para>
 
         <para>

@@ -706,8 +720,13 @@
 
       <listitem>
         <para>
-          The maximum number of rows in a <literal>MERGE</literal> table
-          is
+          There is a limit of 2<superscript>32</superscript>
+          (~4.295E+09) rows to a <literal>MERGE</literal> table, just as
+          there is with a <literal>MyISAM</literal>, it is therefore not
+          possible to merge multiple <literal>MyISAM</literal> tables
+          that exceed this limitation. However, if you build MySQL with the
+          <option>--with-big-tables</option> option, the row
+          limitation is increased to
          
(2<superscript>32</superscript>)<superscript>2</superscript>
           (~1.844E+19; the same as for a <literal>MyISAM</literal>
           table), provided that the server was build using the


Modified: trunk/pt/refman-5.1/se-merge.xml
===================================================================
--- trunk/pt/refman-5.1/se-merge.xml	2008-04-18 14:44:26 UTC (rev 10529)
+++ trunk/pt/refman-5.1/se-merge.xml	2008-04-18 15:02:23 UTC (rev 10530)
Changed blocks: 4, Lines Added: 26, Lines Deleted: 7; 2549 bytes

@@ -206,9 +206,16 @@
         merge table has. The underlying table may have morekeys than the
         <literal>MERGE</literal> table, but cannot have less.
       </para>
-    </listitem>
 
-    <listitem>
+      <note>
+        <para>
+          A known issue exists that keys on the some columns must be
+          identical in order in both the <literal>MERGE</literal> table
+          and the underlying <literal>MyISAM</literal> table. See Bug
+          #33653.
+        </para>
+      </note>
+
       <para>
         For each key:
       </para>

@@ -308,6 +315,13 @@
         Use <literal>ALTER TABLE <replaceable>tbl_name</replaceable>
         UNION=(...)</literal> to change the list of underlying tables.
       </para>
+
+      <para>
+        Beginning with MySQL 5.1.24, it is also possible to use
+        <literal>ALTER TABLE ... UNION=()</literal> (that is, with an
+        empty <literal>UNION</literal> clause) to remove all of the
+        underlying tables. (Bug #28248)
+      </para>
     </listitem>
 
   </itemizedlist>

@@ -619,9 +633,9 @@
 
         <para>
           Because these checks take place when the tables are opened,
-          any changes to the definition of a single, including column
-          changes, ocolumn ordering and engine alterations will cause
-          the statement to fail.
+          any changes to the definition of a single table, including
+          column changes, column ordering and engine alterations will
+          cause the statement to fail.
         </para>
 
         <para>

@@ -706,8 +720,13 @@
 
       <listitem>
         <para>
-          The maximum number of rows in a <literal>MERGE</literal> table
-          is
+          There is a limit of 2<superscript>32</superscript>
+          (~4.295E+09) rows to a <literal>MERGE</literal> table, just as
+          there is with a <literal>MyISAM</literal>, it is therefore not
+          possible to merge multiple <literal>MyISAM</literal> tables
+          that exceed this limitation. However, if you build MySQL with the
+          <option>--with-big-tables</option> option, the row
+          limitation is increased to
          
(2<superscript>32</superscript>)<superscript>2</superscript>
           (~1.844E+19; the same as for a <literal>MyISAM</literal>
           table), provided that the server was build using the


Modified: trunk/refman-4.1/storage-engines.xml
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 113 bytes


Modified: trunk/refman-5.0/se-merge.xml
===================================================================
--- trunk/refman-5.0/se-merge.xml	2008-04-18 14:44:26 UTC (rev 10529)
+++ trunk/refman-5.0/se-merge.xml	2008-04-18 15:02:23 UTC (rev 10530)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 8; 1449 bytes

@@ -728,14 +728,13 @@
 
       <listitem>
         <para>
-          The maximum number of rows in a <literal>MERGE</literal> table
-          is 2<superscript>32</superscript> (~4.295E+09; the same as for
-          a <literal>MyISAM</literal> table). It is not possible to
-          merge multiple <literal>MyISAM</literal> tables into a single
-          <literal>MERGE</literal> table that would have more than this
-          number of rows. However, if you build MySQL using the
-          <option>--with-big-tables</option> option, then the maximum
-          number of rows is increased to
+          There is a limit of 2<superscript>32</superscript>
+          (~4.295E+09) rows to a <literal>MERGE</literal> table, just
+          as there is with a <literal>MyISAM</literal>, it is therefore
+          not possible to merge multiple <literal>MyISAM</literal>
+          tables that exceed this limitation. However, if you build MySQL
+          with the <option>--with-big-tables</option> option, the
+          row limitation is increased to
          
(2<superscript>32</superscript>)<superscript>2</superscript>
           (1.844E+19); for more information, see
           <xref linkend="configure-options"/>.


Modified: trunk/refman-5.1/se-merge.xml
===================================================================
--- trunk/refman-5.1/se-merge.xml	2008-04-18 14:44:26 UTC (rev 10529)
+++ trunk/refman-5.1/se-merge.xml	2008-04-18 15:02:23 UTC (rev 10530)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 2; 1035 bytes

@@ -720,8 +720,13 @@
 
       <listitem>
         <para>
-          The maximum number of rows in a <literal>MERGE</literal> table
-          is
+          There is a limit of 2<superscript>32</superscript>
+          (~4.295E+09) rows to a <literal>MERGE</literal> table, just as
+          there is with a <literal>MyISAM</literal>, it is therefore not
+          possible to merge multiple <literal>MyISAM</literal> tables
+          that exceed this limitation. However, if you build MySQL with the
+          <option>--with-big-tables</option> option, the row
+          limitation is increased to
          
(2<superscript>32</superscript>)<superscript>2</superscript>
           (~1.844E+19; the same as for a <literal>MyISAM</literal>
           table), provided that the server was build using the


Modified: trunk/refman-6.0/se-merge.xml
===================================================================
--- trunk/refman-6.0/se-merge.xml	2008-04-18 14:44:26 UTC (rev 10529)
+++ trunk/refman-6.0/se-merge.xml	2008-04-18 15:02:23 UTC (rev 10530)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 2; 1035 bytes

@@ -667,8 +667,13 @@
 
       <listitem>
         <para>
-          The maximum number of rows in a <literal>MERGE</literal> table
-          is
+          There is a limit of 2<superscript>32</superscript>
+          (~4.295E+09) rows to a <literal>MERGE</literal> table, just as
+          there is with a <literal>MyISAM</literal>, it is therefore not
+          possible to merge multiple <literal>MyISAM</literal> tables
+          that exceed this limitation. However, if you build MySQL with
+          the <option>--with-big-tables</option> option, the row
+          limitation is increased to
          
(2<superscript>32</superscript>)<superscript>2</superscript>
           (~1.844E+19; the same as for a <literal>MyISAM</literal>
           table), provided that the server was build using the