bk commit - mysqldoc@docsrva tree (jon:1.3672)

[jon]

Below is the list of changes that have just been committed into a local
mysqldoc repository of jon. When jon does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3672 05/10/07 11:56:57 jon@stripped +2 -0
  REORGANIZE PARTITION: Fixing omitted INTO keyword in examples.

  refman-5.1/sql-syntax.xml
    1.64 05/10/07 11:56:55 jon@stripped +4 -6
    REORGANIZE PARTITION: Fixing omitted INTO keyword.  

  refman-5.1/partitioning.xml
    1.27 05/10/07 11:56:55 jon@stripped +20 -24
    REORGANIZE PARTITION: Fixing omitted INTO keyword.  

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jon
# Host:	gigan.
# Root:	/home/jon/bk/mysqldoc2

--- 1.26/refman-5.1/partitioning.xml	2005-10-07 11:24:04 +10:00
+++ 1.27/refman-5.1/partitioning.xml	2005-10-07 11:56:55 +10:00
@@ -1463,7 +1463,7 @@
             decade beginning with the year 2000 grows to a point where
             the default location no longer provides sufficient space,
             they can be moved using an <literal>ALTER TABLE ...
-              REORGANISE PARTITION</literal> statement. See <xref
+              REORGANIZE PARTITION</literal> statement. See <xref
                 linkend="partitioning-management"/> for an explanation of
             how this can be done.
           </para>
@@ -1610,9 +1610,9 @@
       <para>
         If you intend to change the partitioning of a table
         <emphasis>without</emphasis> losing data, use <literal>ALTER
-          TABLE ... REORGANISE PARTITION</literal> instead. See below or
+          TABLE ... REORGANIZE PARTITION</literal> instead. See below or
         in <xref linkend="alter-table"/> for information about
-        <literal>REORGANISE PARTITION</literal>.   
+        <literal>REORGANIZE PARTITION</literal>.   
       </para>
       
       <para>
@@ -1834,13 +1834,8 @@
         order to accomplish this:
       </para>
       
-      <remark role="todo">
-        [js] Verify that this is the correct syntax for REORGANISE
-        ( = "file a bug and see what Mikael says").
-      </remark>
-      
 <programlisting>
-ALTER TABLE members REORGANISE PARTITION p0 (
+ALTER TABLE members REORGANIZE PARTITION p0 INTO (
     PARTITION s0 VALUES LESS THAN (1960),
     PARTITION s1 VALUES LESS THAN (1970)
 );
@@ -1860,33 +1855,33 @@
       </para>
       
       <para>
-        A <literal>REORGANISE PARTITION</literal> clause may also be
+        A <literal>REORGANIZE PARTITION</literal> clause may also be
         used for merging adjacent partitions. You can return the
         <literal>members</literal> table to its previous partitioning as
         shown here:
       </para>
       
 <programlisting>
-ALTER TABLE members REORGANISE PARTITION s0,s1 (
+ALTER TABLE members REORGANIZE PARTITION s0,s1 INTO (
     PARTITION p0 VALUES LESS THAN (1970)
 );
 </programlisting>
       
       <para>
         No data is lost in splitting or merging partitions using
-        <literal>REORGANISE TABLE</literal>. In executing the above
+        <literal>REORGANIZE PARTITION</literal>. In executing the above 
         statement, MySQL moves all of the records that were stored in
         partitions <literal>s0</literal> and
<literal>s1</literal> into
         partition <literal>p0</literal>.
       </para>
       
       <para>
-        The general syntax for <literal>REORGANISE PARTITION</literal>
+        The general syntax for <literal>REORGANIZE PARTITION</literal>
         is: 
       </para>
       
 <programlisting>
-ALTER TABLE <replaceable>tbl_name</replaceable> REORGANISE PARTITION
<replaceable>partition_list </replaceable>
(<replaceable>partition_definitions</replaceable>);
+ALTER TABLE <replaceable>tbl_name</replaceable> REORGANIZE PARTITION
<replaceable>partition_list </replaceable> INTO
(<replaceable>partition_definitions</replaceable>);
 </programlisting>
       
       <para>
@@ -1900,21 +1895,21 @@
         <literal>CREATE TABLE</literal> (see <xref
           linkend="create-table"/>). It should be noted that you are not
         limited to merging several partitions into one, or to splitting one
-        partition into many, when using <literal>REORGANISE
+        partition into many, when using <literal>REORGANIZE
           PARTITION</literal>. For example, you can reorganise all four
         partitions of the <literal>members</literal> table into two, as
         follows: 
       </para>      
       
 <programlisting>
-ALTER TABLE members REORGANISE PARTITION p0,p1,p2,p3 (
+ALTER TABLE members REORGANIZE PARTITION p0,p1,p2,p3 INTO (
     PARTITION m0 VALUES LESS THAN (1980),
     PARTITION m1 VALUES LESS THAN (2000)
 );
 </programlisting>
       
       <para>
-        You can also use <literal>REORGANISE PARTITION</literal> with
+        You can also use <literal>REORGANIZE PARTITION</literal> with
         tables that are partitioned by <literal>LIST</literal>. Let us
         return to the problem of adding a new partition to the
         list-partitioned <literal>tt</literal> table and failing because
@@ -1932,7 +1927,7 @@
       
 <programlisting>
 ALTER TABLE tt ADD PARTITION (PARTITION np VALUES IN (4, 8));
-ALTER TABLE tt REORGANISE PARTITION p1,np (
+ALTER TABLE tt REORGANIZE PARTITION p1,np INTO (
     PARTITION p1 VALUES IN (6, 18),
     PARTITION np VALUES in (4, 8, 12)
 );
@@ -1940,7 +1935,7 @@
       
       <para>
         Here are some key points to keep in mind when using
-        <literal>ALTER TABLE ... REORGANISE PARTITION</literal> to
+        <literal>ALTER TABLE ... REORGANIZE PARTITION</literal> to
         repartition tables that are partitioned by
         <literal>RANGE</literal> or <literal>LIST</literal>: 
       </para>
@@ -1992,16 +1987,17 @@
             For instance, you could not reorganise the
             <literal>members</literal> table used as an example in this
             section using a statement beginning with <literal>ALTER
-              TABLE members REORGANISE PARTITION p0,p2 ...</literal>
-            because <literal>p0</literal> covers the years prior to 1970
-            and <literal>p2</literal> the years from 1990 through 1999
-            inclusive, and thus the two are not ajacent partitions.
+              TABLE members REORGANIZE PARTITION p0,p2 INTO
+              ...</literal> because <literal>p0</literal> covers the
+            years prior to 1970 and <literal>p2</literal> the years from
+            1990 through 1999 inclusive, and thus the two are not
+            ajacent partitions. 
           </para>
         </listitem>
         
         <listitem>
           <para>
-            You cannot use <literal>REORGANISE PARTITION</literal> to
+            You cannot use <literal>REORGANIZE PARTITION</literal> to
             change the table's partitioning type; that is, you cannot
             (for example) change <literal>RANGE</literal> partitions to
             <literal>LIST</literal> partitions or <foreignphrase>vice

--- 1.63/refman-5.1/sql-syntax.xml	2005-10-07 11:24:04 +10:00
+++ 1.64/refman-5.1/sql-syntax.xml	2005-10-07 11:56:55 +10:00
@@ -161,7 +161,7 @@
   | ADD PARTITION <replaceable>partition_definition</replaceable>
   | DROP PARTITION <replaceable>partition_names</replaceable>
   | COALESCE PARTITION <replaceable>number</replaceable>
-  | REORGANISE PARTITION <replaceable>partition_names</replaceable>
(<replaceable>partition_definitions</replaceable>)
+  | REORGANIZE PARTITION <replaceable>partition_names</replaceable> INTO
(<replaceable>partition_definitions</replaceable>) 
 </programlisting>
 
       <remark>
@@ -878,7 +878,7 @@
 
           <para>
             To change some but not all the partitions used by a
-            partitioned table, you can use <literal>REORGANISE
+            partitioned table, you can use <literal>REORGANIZE
             PARTITION</literal>. This command can be used in several
             ways:
           </para>
@@ -925,10 +925,8 @@
 
           <para>
             For more detailed information about and examples of
-            <literal>ALTER TABLE ... REORGANISE PARTITION</literal>
-            commands, see
-            <xref
-              linkend="partitioning-management"/>.
+            <literal>ALTER TABLE ... REORGANIZE PARTITION</literal>
+            commands, see <xref linkend="partitioning-management"/>. 
           </para>
         </listitem>